mux: mmio: Fix IS_ERR() vs NULL check in probe()

[PATCH next] mux: mmio: Fix IS_ERR() vs NULL check in probe()

Posted by Dan Carpenter 2 days, 7 hours ago

The devm_kmalloc() function never returns error pointers, it returns
NULL on error.  Fix the error checking.

Fixes: 4863cb2b0f50 ("mux: mmio: Add suspend and resume support")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 drivers/mux/mmio.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c
index e4ddb1e61923..3409af1ffb80 100644
--- a/drivers/mux/mmio.c
+++ b/drivers/mux/mmio.c
@@ -101,13 +101,13 @@ static int mux_mmio_probe(struct platform_device *pdev)
 	mux_mmio = mux_chip_priv(mux_chip);
 
 	mux_mmio->fields = devm_kmalloc(dev, num_fields * sizeof(*mux_mmio->fields), GFP_KERNEL);
-	if (IS_ERR(mux_mmio->fields))
-		return PTR_ERR(mux_mmio->fields);
+	if (!mux_mmio->fields)
+		return -ENOMEM;
 
 	mux_mmio->hardware_states = devm_kmalloc(dev, num_fields *
 						 sizeof(*mux_mmio->hardware_states), GFP_KERNEL);
-	if (IS_ERR(mux_mmio->hardware_states))
-		return PTR_ERR(mux_mmio->hardware_states);
+	if (!mux_mmio->hardware_states)
+		return -ENOMEM;
 
 	for (i = 0; i < num_fields; i++) {
 		struct mux_control *mux = &mux_chip->mux[i];
-- 
2.51.0

Re: [PATCH next] mux: mmio: Fix IS_ERR() vs NULL check in probe()

Posted by Krzysztof Kozlowski 2 days, 7 hours ago

On 29/11/2025 15:50, Dan Carpenter wrote:
> The devm_kmalloc() function never returns error pointers, it returns
> NULL on error.  Fix the error checking.
> 
> Fixes: 4863cb2b0f50 ("mux: mmio: Add suspend and resume support")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
>  drivers/mux/mmio.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c
> index e4ddb1e61923..3409af1ffb80 100644
> --- a/drivers/mux/mmio.c
> +++ b/drivers/mux/mmio.c
> @@ -101,13 +101,13 @@ static int mux_mmio_probe(struct platform_device *pdev)
>  	mux_mmio = mux_chip_priv(mux_chip);
>  
>  	mux_mmio->fields = devm_kmalloc(dev, num_fields * sizeof(*mux_mmio->fields), GFP_KERNEL);
> -	if (IS_ERR(mux_mmio->fields))
> -		return PTR_ERR(mux_mmio->fields);
> +	if (!mux_mmio->fields)
> +		return -ENOMEM;
>  

I wonder from where Thomas copied this code...

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

@Greg, that's a fix for something in your tree.

Best regards,
Krzysztof