Unverified Commit a8cad4a4 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mark Brown
Browse files

ASoC: soc-card: soc-card-test: Fix some error handling in init() 



There are two issues here:
1) The get_device() needs a matching put_device() on error paths.
2) The "if (!ret)" was supposed to be "if (ret)".

I re-arranged the code a bit to do the allocation before the
get_device().

Fixes: ef7784e4 ("ASoC: soc-card: Add KUnit test case for snd_soc_card_get_kcontrol")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/450dd21a-b24b-48ba-9aa4-c02e4617852f@moroto.mountain


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4be7bc27

sound/soc/soc-card-test.c

+7 −5
Original line number Diff line number Diff line
@@ -134,22 +134,24 @@ static int soc_card_test_case_init(struct kunit *test) 


	test->priv = priv;



	priv->card = kunit_kzalloc(test, sizeof(*priv->card), GFP_KERNEL);

	if (!priv->card)

		return -ENOMEM;



	priv->card_dev = kunit_device_register(test, "sound-soc-card-test");

	priv->card_dev = get_device(priv->card_dev);

	if (!priv->card_dev)

		return -ENODEV;



	priv->card = kunit_kzalloc(test, sizeof(*priv->card), GFP_KERNEL);

	if (!priv->card)

		return -ENOMEM;



	priv->card->name = "soc-card-test";

	priv->card->dev = priv->card_dev;

	priv->card->owner = THIS_MODULE;



	ret = snd_soc_register_card(priv->card);

	if (!ret)

	if (ret) {

		put_device(priv->card_dev);

		return ret;

	}



	return 0;

}