aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-05-23 13:32:35 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-05-27 05:54:46 -0400
commitc2b00024bc6f3408b0facc87227383e633131900 (patch)
tree51a58dc1f284aba81bbc1083365d0c25978da159
parent550e768c2a9932e037f2148ecddecd8a5ee0f26e (diff)
fbdev: ssd1307fb: potential ERR_PTR dereference
The error handling got shifted down a few lines from where it was supposed to be for some reason. Fixes: a14a7ba8cb0f ('fbdev: ssd1307fb: add backlight controls for setting the contrast') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/fbdev/ssd1307fb.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index 8fc224c99032..9c28a77c2934 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -655,15 +655,16 @@ static int ssd1307fb_probe(struct i2c_client *client,
655 snprintf(bl_name, sizeof(bl_name), "ssd1307fb%d", info->node); 655 snprintf(bl_name, sizeof(bl_name), "ssd1307fb%d", info->node);
656 bl = backlight_device_register(bl_name, &client->dev, par, 656 bl = backlight_device_register(bl_name, &client->dev, par,
657 &ssd1307fb_bl_ops, NULL); 657 &ssd1307fb_bl_ops, NULL);
658 bl->props.brightness = par->contrast;
659 bl->props.max_brightness = MAX_CONTRAST;
660 info->bl_dev = bl;
661
662 if (IS_ERR(bl)) { 658 if (IS_ERR(bl)) {
663 dev_err(&client->dev, "unable to register backlight device: %ld\n", 659 dev_err(&client->dev, "unable to register backlight device: %ld\n",
664 PTR_ERR(bl)); 660 PTR_ERR(bl));
665 goto bl_init_error; 661 goto bl_init_error;
666 } 662 }
663
664 bl->props.brightness = par->contrast;
665 bl->props.max_brightness = MAX_CONTRAST;
666 info->bl_dev = bl;
667
667 dev_info(&client->dev, "fb%d: %s framebuffer device registered, using %d bytes of video memory\n", info->node, info->fix.id, vmem_size); 668 dev_info(&client->dev, "fb%d: %s framebuffer device registered, using %d bytes of video memory\n", info->node, info->fix.id, vmem_size);
668 669
669 return 0; 670 return 0;