linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] imxfb: correct location of callbacks in suspend and resume
Date: Mon, 11 Jan 2010 16:21:21 +0000	[thread overview]
Message-ID: <1263226881-28008-1-git-send-email-u.kleine-koenig@pengutronix.de> (raw)

The probe function passes a pointer to a struct fb_info to
platform_set_drvdata, so don't interpret the return value of
platform_get_drvdata as a pointer to struct imxfb_info.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
---
 drivers/video/imxfb.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 66358fa..b4b6dec 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -593,7 +593,8 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
  */
 static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
 {
-	struct imxfb_info *fbi = platform_get_drvdata(dev);
+	struct fb_info *info = platform_get_drvdata(dev);
+	struct imxfb_info *fbi = info->par;
 
 	pr_debug("%s\n", __func__);
 
@@ -603,7 +604,8 @@ static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
 
 static int imxfb_resume(struct platform_device *dev)
 {
-	struct imxfb_info *fbi = platform_get_drvdata(dev);
+	struct fb_info *info = platform_get_drvdata(dev);
+	struct imxfb_info *fbi = info->par;
 
 	pr_debug("%s\n", __func__);
 
-- 
1.6.5.2


             reply	other threads:[~2010-01-11 16:21 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-11 16:21  [this message]
2010-01-11 17:59 ` [PATCH] imxfb: correct location of callbacks in suspend and Sascha Hauer
2010-01-25 15:37 ` [PATCH] imxfb: correct location of callbacks in suspend and resume 
2010-01-27 23:48   ` [PATCH] imxfb: correct location of callbacks in suspend and Andrew Morton
2010-01-28  7:41     ` 
2010-01-28  8:19       ` Andrew Morton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1263226881-28008-1-git-send-email-u.kleine-koenig@pengutronix.de \
    --to=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).