Unverified Commit b389df0f authored by Dan Carpenter's avatar Dan Carpenter Committed by Javier Martinez Canillas
Browse files

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



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: 4b35f0f4 ("drm/st7571-i2c: add support for Sitronix ST7571 LCD controller")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://lore.kernel.org/r/aBHZYgPPPYY-J8Vd@stanley.mountain


Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
parent 0d607a59

drivers/gpu/drm/tiny/st7571-i2c.c

+4 −6
Original line number Diff line number Diff line
@@ -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)