diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 06:14:26 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 06:14:26 +0200 |
| commit | d5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch) | |
| tree | 4facc6d96116b032a3c1cb2ced9b2a3008e9216e /drivers/video/bf54x-lq043fb.c | |
| parent | ARM: mach-shmobile: SH7372 has 6 SCIFA and 1 SCIFB ports (diff) | |
| parent | Linux 2.6.35-rc1 (diff) | |
| download | linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.xz linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/bf54x-lq043fb.c')
| -rw-r--r-- | drivers/video/bf54x-lq043fb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 23b2a8c0dbfc..b020ba7f1cf2 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c @@ -501,7 +501,9 @@ static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id) static int __devinit bfin_bf54x_probe(struct platform_device *pdev) { +#ifndef NO_BL_SUPPORT struct backlight_properties props; +#endif struct bfin_bf54xfb_info *info; struct fb_info *fbinfo; int ret; @@ -654,7 +656,8 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev) printk(KERN_ERR DRIVER_NAME ": unable to register backlight.\n"); ret = -EINVAL; - goto out9; + unregister_framebuffer(fbinfo); + goto out8; } lcd_dev = lcd_device_register(DRIVER_NAME, &pdev->dev, NULL, &bfin_lcd_ops); @@ -663,8 +666,6 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev) return 0; -out9: - unregister_framebuffer(fbinfo); out8: free_irq(info->irq, info); out7: |