drm/st7571-i2c: Fix IS_ERR() vs NULL checks in probe()

[PATCH next] drm/st7571-i2c: Fix IS_ERR() vs NULL checks in probe()

Posted by Dan Carpenter 9 months, 1 week ago

The devm_kzalloc() function returns NULL on failure, not error pointers.
Also printing an error message for kmalloc() failures is against kernel
style so just return -ENOMEM without printing a message.  (Kmalloc
already prints a message).

Fixes: 4b35f0f41ee2 ("drm/st7571-i2c: add support for Sitronix ST7571 LCD controller")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 drivers/gpu/drm/tiny/st7571-i2c.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/tiny/st7571-i2c.c b/drivers/gpu/drm/tiny/st7571-i2c.c
index dc410ec41baf..eec846892962 100644
--- a/drivers/gpu/drm/tiny/st7571-i2c.c
+++ b/drivers/gpu/drm/tiny/st7571-i2c.c
@@ -908,16 +908,14 @@ static int st7571_probe(struct i2c_client *client)
 	st7571->hwbuf = devm_kzalloc(&client->dev,
 				     (st7571->nlines * st7571->ncols * st7571->bpp) / 8,
 				     GFP_KERNEL);
-	if (IS_ERR(st7571->hwbuf))
-		return dev_err_probe(&client->dev, PTR_ERR(st7571->hwbuf),
-				     "Failed to allocate intermediate buffer\n");
+	if (!st7571->hwbuf)
+		return -ENOMEM;
 
 	st7571->row = devm_kzalloc(&client->dev,
 				   (st7571->ncols * st7571->bpp),
 				   GFP_KERNEL);
-	if (IS_ERR(st7571->row))
-		return dev_err_probe(&client->dev, PTR_ERR(st7571->row),
-				     "Failed to allocate row buffer\n");
+	if (!st7571->row)
+		return -ENOMEM;
 
 	ret = st7571_mode_config_init(st7571);
 	if (ret)
-- 
2.47.2

Re: [PATCH next] drm/st7571-i2c: Fix IS_ERR() vs NULL checks in probe()

Posted by Javier Martinez Canillas 9 months, 1 week ago

Dan Carpenter <dan.carpenter@linaro.org> writes:

Hello Dan,

> The devm_kzalloc() function returns NULL on failure, not error pointers.
> Also printing an error message for kmalloc() failures is against kernel
> style so just return -ENOMEM without printing a message.  (Kmalloc
> already prints a message).
>
> Fixes: 4b35f0f41ee2 ("drm/st7571-i2c: add support for Sitronix ST7571 LCD controller")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat

Re: [PATCH next] drm/st7571-i2c: Fix IS_ERR() vs NULL checks in probe()

Posted by Javier Martinez Canillas 9 months, 1 week ago

Javier Martinez Canillas <javierm@redhat.com> writes:

> Dan Carpenter <dan.carpenter@linaro.org> writes:
>
> Hello Dan,
>
>> The devm_kzalloc() function returns NULL on failure, not error pointers.
>> Also printing an error message for kmalloc() failures is against kernel
>> style so just return -ENOMEM without printing a message.  (Kmalloc
>> already prints a message).
>>
>> Fixes: 4b35f0f41ee2 ("drm/st7571-i2c: add support for Sitronix ST7571 LCD controller")
>> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
>> ---
>
> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
>

Pushed to drm-misc (drm-misc-next). Thanks!

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat