From ae203fd733856be2b9e9b5d72f59d883a9b99cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 2 Feb 2010 13:44:10 -0800 Subject: [PATCH] --- yaml --- r: 180179 b: refs/heads/master c: 1ec562035ba64e724652cb12b8a770b3906e9bf5 h: refs/heads/master i: 180177: 869daf0618daebd76be50a2d621ec61c67f6c020 180175: 2f4961d0738e12ff6ba2d9f5330594e293efabf6 v: v3 --- [refs] | 2 +- trunk/drivers/video/imxfb.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 34a6e22ecb3f..61c6f897e9a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4528fd0595847c2078b59f24800e751c2d6b7e41 +refs/heads/master: 1ec562035ba64e724652cb12b8a770b3906e9bf5 diff --git a/trunk/drivers/video/imxfb.c b/trunk/drivers/video/imxfb.c index 66358fa825f3..b4b6deceed15 100644 --- a/trunk/drivers/video/imxfb.c +++ b/trunk/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__);