Fix broken fix for fsl-diu-db

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

This patch reverts the broken part.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 712dabc..09d7e22 100644 (file)
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -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]);
 
        return 0;
        disable_lcdc(machine_data->fsl_diu_info[0]);
 
        return 0;


@@ -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]);
 
        return 0;
        enable_lcdc(machine_data->fsl_diu_info[0]);
 
        return 0;