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 git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
drivers
/
video
/
backlight
/
platform_lcd.c
diff --git
a/drivers/video/backlight/platform_lcd.c
b/drivers/video/backlight/platform_lcd.c
index
72d44db
..
738694d
100644
(file)
--- a/
drivers/video/backlight/platform_lcd.c
+++ b/
drivers/video/backlight/platform_lcd.c
@@
-92,7
+92,7
@@
static int __devinit platform_lcd_probe(struct platform_device *pdev)
plcd->us = dev;
plcd->pdata = pdata;
plcd->us = dev;
plcd->pdata = pdata;
- plcd->lcd = lcd_device_register(
"platform-lcd"
, dev,
+ plcd->lcd = lcd_device_register(
dev_name(dev)
, dev,
plcd, &platform_lcd_ops);
if (IS_ERR(plcd->lcd)) {
dev_err(dev, "cannot register lcd device\n");
plcd, &platform_lcd_ops);
if (IS_ERR(plcd->lcd)) {
dev_err(dev, "cannot register lcd device\n");
@@
-101,6
+101,8
@@
static int __devinit platform_lcd_probe(struct platform_device *pdev)
}
platform_set_drvdata(pdev, plcd);
}
platform_set_drvdata(pdev, plcd);
+ platform_lcd_set_power(plcd->lcd, FB_BLANK_NORMAL);
+
return 0;
err_mem:
return 0;
err_mem: