提交 48948a3e 编写于 作者: T Takashi Iwai 提交者: Linus Torvalds

Fix broken fix for fsl-diu-db

On 2.6.26-rc9, the commit 05946bce
("fsl_diu_fb: fix build with CONFIG_PM=y, plus fix some warnings")
breaks its previous fix f969c567
("fsl-diu-db: compile fix")

This patch reverts the broken part.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
Acked-by: NAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 f57e9168
...@@ -1324,7 +1324,7 @@ static int fsl_diu_suspend(struct of_device *ofdev, pm_message_t state) ...@@ -1324,7 +1324,7 @@ static int fsl_diu_suspend(struct of_device *ofdev, pm_message_t state)
{ {
struct fsl_diu_data *machine_data; struct fsl_diu_data *machine_data;
machine_data = dev_get_drvdata(&dev->dev); machine_data = dev_get_drvdata(&ofdev->dev);
disable_lcdc(machine_data->fsl_diu_info[0]); disable_lcdc(machine_data->fsl_diu_info[0]);
return 0; return 0;
...@@ -1334,7 +1334,7 @@ static int fsl_diu_resume(struct of_device *ofdev) ...@@ -1334,7 +1334,7 @@ static int fsl_diu_resume(struct of_device *ofdev)
{ {
struct fsl_diu_data *machine_data; struct fsl_diu_data *machine_data;
machine_data = dev_get_drvdata(&dev->dev); machine_data = dev_get_drvdata(&ofdev->dev);
enable_lcdc(machine_data->fsl_diu_info[0]); enable_lcdc(machine_data->fsl_diu_info[0]);
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册