Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755658AbYGHOla (ORCPT ); Tue, 8 Jul 2008 10:41:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753525AbYGHOlX (ORCPT ); Tue, 8 Jul 2008 10:41:23 -0400 Received: from cantor.suse.de ([195.135.220.2]:56867 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753452AbYGHOlW (ORCPT ); Tue, 8 Jul 2008 10:41:22 -0400 Date: Tue, 08 Jul 2008 18:41:17 +0200 Message-ID: From: Takashi Iwai To: Linus Torvalds Cc: Andrew Morton , Anton Vorontsov , linux-kernel@vger.kernel.org Subject: [PATCH] Fix broken fix for fsl-diu-db User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.2 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1279 Lines: 36 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 --- 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/