mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-27 22:51:31 +00:00
drivers/video/backlight/ld9040.c: small fixes
- Fix checking of wrong return value for backlight_device_register() - Properly free allocated resources in ld9040_probe() error path and ld9040_remove(). Signed-off-by: Axel Lin <axel.lin@gmail.com> Cc: Donghwa Lee <dh09.lee@samsung.com> Cc: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ccb6108f5b
commit
e2e7da9bcc
1 changed files with 6 additions and 3 deletions
|
@ -701,9 +701,9 @@ static int ld9040_probe(struct spi_device *spi)
|
||||||
|
|
||||||
bd = backlight_device_register("ld9040-bl", &spi->dev,
|
bd = backlight_device_register("ld9040-bl", &spi->dev,
|
||||||
lcd, &ld9040_backlight_ops, NULL);
|
lcd, &ld9040_backlight_ops, NULL);
|
||||||
if (IS_ERR(ld)) {
|
if (IS_ERR(bd)) {
|
||||||
ret = PTR_ERR(ld);
|
ret = PTR_ERR(bd);
|
||||||
goto out_free_lcd;
|
goto out_unregister_lcd;
|
||||||
}
|
}
|
||||||
|
|
||||||
bd->props.max_brightness = MAX_BRIGHTNESS;
|
bd->props.max_brightness = MAX_BRIGHTNESS;
|
||||||
|
@ -731,6 +731,8 @@ static int ld9040_probe(struct spi_device *spi)
|
||||||
dev_info(&spi->dev, "ld9040 panel driver has been probed.\n");
|
dev_info(&spi->dev, "ld9040 panel driver has been probed.\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
out_unregister_lcd:
|
||||||
|
lcd_device_unregister(lcd->ld);
|
||||||
out_free_lcd:
|
out_free_lcd:
|
||||||
kfree(lcd);
|
kfree(lcd);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -741,6 +743,7 @@ static int __devexit ld9040_remove(struct spi_device *spi)
|
||||||
struct ld9040 *lcd = dev_get_drvdata(&spi->dev);
|
struct ld9040 *lcd = dev_get_drvdata(&spi->dev);
|
||||||
|
|
||||||
ld9040_power(lcd, FB_BLANK_POWERDOWN);
|
ld9040_power(lcd, FB_BLANK_POWERDOWN);
|
||||||
|
backlight_device_unregister(lcd->bd);
|
||||||
lcd_device_unregister(lcd->ld);
|
lcd_device_unregister(lcd->ld);
|
||||||
kfree(lcd);
|
kfree(lcd);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue