Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48948a3e authored by Takashi Iwai's avatar Takashi Iwai Committed by Linus Torvalds
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f57e9168

drivers/video/fsl-diu-fb.c

+2 −2
Original line number Diff line number Diff line
@@ -1324,7 +1324,7 @@ static int fsl_diu_suspend(struct of_device *ofdev, pm_message_t state) 
{

	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;
@@ -1334,7 +1334,7 @@ static int fsl_diu_resume(struct of_device *ofdev) 
{

	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;