Skip to contentSkip to conversation

Fix broken fix for fsl-diu-db

PATCH In review Takashi Iwai 2 participants 2 messages Jul 8, 2008 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

drivers/video/fsl-diu-fb.c +2 -2
index 712dabc..09d7e22 100644
@@ -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;
#1 lore raw
Quoted 4 lines · Takashi Iwai

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

Yeah, I sent the fix on Jun 06, it hanged around in the mailing list for month, meanwhile Linus directly applied Jeff Mahoney's fix on Jun 12 (git says).

Quite funny they didn't conflict.

Quoted 3 lines

This patch reverts the broken part.

So... ack, and it wasn't my fault, FWIW. :-P

Quoted 23 lines

---

drivers/video/fsl-diu-fb.c +2 -2
index 712dabc..09d7e22 100644
@@ -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;
Signature · 3 lines
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2