Commit b6c2b66d authored by Jouni Hogander's avatar Jouni Hogander Committed by Linus Torvalds

omapfb: suspend/resume only if FB device is already initialized

Check wether fbdev is NULL in suspend / resume functions. Fbdev is
NULL, if there is no lcd or it is not enabled in configuration.
Signed-off-by: default avatarJouni Hogander <jouni.hogander@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarImre Deak <imre.deak@nokia.com>
Acked-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4c88ef17
...@@ -1846,8 +1846,8 @@ static int omapfb_suspend(struct platform_device *pdev, pm_message_t mesg) ...@@ -1846,8 +1846,8 @@ static int omapfb_suspend(struct platform_device *pdev, pm_message_t mesg)
{ {
struct omapfb_device *fbdev = platform_get_drvdata(pdev); struct omapfb_device *fbdev = platform_get_drvdata(pdev);
if (fbdev != NULL)
omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]); omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]);
return 0; return 0;
} }
...@@ -1856,6 +1856,7 @@ static int omapfb_resume(struct platform_device *pdev) ...@@ -1856,6 +1856,7 @@ static int omapfb_resume(struct platform_device *pdev)
{ {
struct omapfb_device *fbdev = platform_get_drvdata(pdev); struct omapfb_device *fbdev = platform_get_drvdata(pdev);
if (fbdev != NULL)
omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]); omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment