[PATCH -next] clk: lmk04832: fix return value check in lmk04832_probe()

[PATCH -next] clk: lmk04832: fix return value check in lmk04832_probe()

[Wang Hai]

In case of error, the function devm_kzalloc() and devm_kcalloc() return
NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.

Fixes: 3bc61cfd6f4a ("clk: add support for the lmk04832")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
---
 drivers/clk/clk-lmk04832.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c
index 0cd76e626c3..66ad5cbe702 100644
--- a/drivers/clk/clk-lmk04832.c
+++ b/drivers/clk/clk-lmk04832.c
@@ -1425,23 +1425,23 @@ static int lmk04832_probe(struct spi_device *spi)
 
 	lmk->dclk = devm_kcalloc(lmk->dev, info->num_channels >> 1,
 				 sizeof(struct lmk_dclk), GFP_KERNEL);
-	if (IS_ERR(lmk->dclk)) {
-		ret = PTR_ERR(lmk->dclk);
+	if (!lmk->dclk) {
+		ret = -ENOMEM;
 		goto err_disable_oscin;
 	}
 
 	lmk->clkout = devm_kcalloc(lmk->dev, info->num_channels,
 				   sizeof(*lmk->clkout), GFP_KERNEL);
-	if (IS_ERR(lmk->clkout)) {
-		ret = PTR_ERR(lmk->clkout);
+	if (!lmk->clkout) {
+		ret = -ENOMEM;
 		goto err_disable_oscin;
 	}
 
 	lmk->clk_data = devm_kzalloc(lmk->dev, struct_size(lmk->clk_data, hws,
 							   info->num_channels),
 				     GFP_KERNEL);
-	if (IS_ERR(lmk->clk_data)) {
-		ret = PTR_ERR(lmk->clk_data);
+	if (!lmk->clk_data) {
+		ret = -ENOMEM;
 		goto err_disable_oscin;
 	}
 
-- 
2.17.1

RE: [PATCH -next] clk: lmk04832: fix return value check in lmk04832_probe()

[Liam Beguin]

> -----Original Message-----
> From: Wang Hai <wanghai38@huawei.com>
> Sent: June 29, 2021 10:03 PM
> To: mturquette@baylibre.com; sboyd@kernel.org; Liam Beguin
> <lvb@xiphos.com>
> Cc: linux-clk@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [PATCH -next] clk: lmk04832: fix return value check in
> lmk04832_probe()
> 
> In case of error, the function devm_kzalloc() and devm_kcalloc() return
> NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check
> should be replaced with NULL test.
> 
> Fixes: 3bc61cfd6f4a ("clk: add support for the lmk04832")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wang Hai <wanghai38@huawei.com>

Reviewed-by: Liam Beguin <lvb@xiphos.com>

> ---
>  drivers/clk/clk-lmk04832.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c
> index 0cd76e626c3..66ad5cbe702 100644
> --- a/drivers/clk/clk-lmk04832.c
> +++ b/drivers/clk/clk-lmk04832.c
> @@ -1425,23 +1425,23 @@ static int lmk04832_probe(struct spi_device
> *spi)
> 
>  	lmk->dclk = devm_kcalloc(lmk->dev, info->num_channels >> 1,
>  				 sizeof(struct lmk_dclk), GFP_KERNEL);
> -	if (IS_ERR(lmk->dclk)) {
> -		ret = PTR_ERR(lmk->dclk);
> +	if (!lmk->dclk) {
> +		ret = -ENOMEM;
>  		goto err_disable_oscin;
>  	}
> 
>  	lmk->clkout = devm_kcalloc(lmk->dev, info->num_channels,
>  				   sizeof(*lmk->clkout), GFP_KERNEL);
> -	if (IS_ERR(lmk->clkout)) {
> -		ret = PTR_ERR(lmk->clkout);
> +	if (!lmk->clkout) {
> +		ret = -ENOMEM;
>  		goto err_disable_oscin;
>  	}
> 
>  	lmk->clk_data = devm_kzalloc(lmk->dev, struct_size(lmk->clk_data,
> hws,
>  							   info-
> >num_channels),
>  				     GFP_KERNEL);
> -	if (IS_ERR(lmk->clk_data)) {
> -		ret = PTR_ERR(lmk->clk_data);
> +	if (!lmk->clk_data) {
> +		ret = -ENOMEM;
>  		goto err_disable_oscin;
>  	}
> 
> --
> 2.17.1

Re: [PATCH -next] clk: lmk04832: fix return value check in lmk04832_probe()

[Stephen Boyd]

Quoting Wang Hai (2021-06-29 19:03:22)
> In case of error, the function devm_kzalloc() and devm_kcalloc() return
> NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check
> should be replaced with NULL test.
> 
> Fixes: 3bc61cfd6f4a ("clk: add support for the lmk04832")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wang Hai <wanghai38@huawei.com>
> ---

Applied to clk-next