mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
imxfb: correct location of callbacks in suspend and resume
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. The original imxfb_info *fbi backlight_power was NULL but in imxfb_suspend it was 4 resulting in an oops as imxfb_suspend calls imxfb_disable_controller(fbi) which in turn has if (fbi->backlight_power) fbi->backlight_power(0); Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Sascha Hauer <kernel@pengutronix.de> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4528fd0595
commit
1ec562035b
1 changed files with 4 additions and 2 deletions
|
@ -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__);
|
||||
|
||||
|
|
Loading…
Reference in a new issue