lkml.org 
[lkml]   [2008]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Fix broken fix for fsl-diu-db
On Tue, Jul 08, 2008 at 06:41:17PM +0200, Takashi Iwai wrote:
> 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.

> This patch reverts the broken part.
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

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

> ---
> diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
> index 712dabc..09d7e22 100644
> --- 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;
>
> - 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;

--
Anton Vorontsov
email: cbouatmailru@gmail.com
irc://irc.freenode.net/bd2


\
 
 \ /
  Last update: 2008-07-08 17:17    [W:0.033 / U:0.740 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site