git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
drivers
/
video
/
bfin-t350mcqb-fb.c
diff --git
a/drivers/video/bfin-t350mcqb-fb.c
b/drivers/video/bfin-t350mcqb-fb.c
index
c2ec3dc
..
7a50272
100644
(file)
--- a/
drivers/video/bfin-t350mcqb-fb.c
+++ b/
drivers/video/bfin-t350mcqb-fb.c
@@
-420,7
+420,9
@@
static irqreturn_t bfin_t350mcqb_irq_error(int irq, void *dev_id)
static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
{
static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
{
+#ifndef NO_BL_SUPPORT
struct backlight_properties props;
struct backlight_properties props;
+#endif
struct bfin_t350mcqbfb_info *info;
struct fb_info *fbinfo;
int ret;
struct bfin_t350mcqbfb_info *info;
struct fb_info *fbinfo;
int ret;
@@
-550,7
+552,8
@@
static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
printk(KERN_ERR DRIVER_NAME
": unable to register backlight.\n");
ret = -EINVAL;
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, NULL, &bfin_lcd_ops);
}
lcd_dev = lcd_device_register(DRIVER_NAME, NULL, &bfin_lcd_ops);
@@
-559,8
+562,6
@@
static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
return 0;
return 0;
-out9:
- unregister_framebuffer(fbinfo);
out8:
free_irq(info->irq, info);
out7:
out8:
free_irq(info->irq, info);
out7: