Received-SPF: pass (google.com: domain of linux-kernel+bounces-142679-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <b66339af-1e07-4509-9fd8-12a927618172@opensource.cirrus.com>
Date: Fri, 12 Apr 2024 14:02:20 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v3] ASoC: soc-card: soc-card-test: Fix some error handling
 in init()
To: Dan Carpenter <dan.carpenter@linaro.org>
CC: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>,
        Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
        <linux-sound@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <kernel-janitors@vger.kernel.org>
References: <450dd21a-b24b-48ba-9aa4-c02e4617852f@moroto.mountain>
Content-Language: en-GB
From: Richard Fitzgerald <rf@opensource.cirrus.com>
In-Reply-To: <450dd21a-b24b-48ba-9aa4-c02e4617852f@moroto.mountain>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit

On 12/04/2024 13:07, Dan Carpenter wrote:
> 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: ef7784e41db7 ("ASoC: soc-card: Add KUnit test case for snd_soc_card_get_kcontrol")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> v2: add a put_device()
> v3: move the kunit_kzalloc() to avoid a second put_device().  Btw,
>      kunit_kzalloc() is cleaned up automatically.
> 
>   sound/soc/soc-card-test.c | 12 +++++++-----
>   1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/sound/soc/soc-card-test.c b/sound/soc/soc-card-test.c
> index 075c52fe82e5..e4a4b101d743 100644
> --- a/sound/soc/soc-card-test.c
> +++ b/sound/soc/soc-card-test.c
> @@ -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;
>   }
Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>