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: Jouni Hogander <jouni.hogander@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Imre Deak <imre.deak@nokia.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4c88ef170f
commit
b6c2b66d35
1 changed files with 4 additions and 3 deletions
|
@ -1846,8 +1846,8 @@ static int omapfb_suspend(struct platform_device *pdev, pm_message_t mesg)
|
|||
{
|
||||
struct omapfb_device *fbdev = platform_get_drvdata(pdev);
|
||||
|
||||
omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]);
|
||||
|
||||
if (fbdev != NULL)
|
||||
omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1856,7 +1856,8 @@ static int omapfb_resume(struct platform_device *pdev)
|
|||
{
|
||||
struct omapfb_device *fbdev = platform_get_drvdata(pdev);
|
||||
|
||||
omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]);
|
||||
if (fbdev != NULL)
|
||||
omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue