diff options
author | Jouni Hogander <jouni.hogander@nokia.com> | 2009-09-22 19:46:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:50 -0400 |
commit | b6c2b66d353dba229ce167acef49639b9ddf90d9 (patch) | |
tree | 713588f83eb02bec22dfce4f6a9b9930f83ed9ce /drivers | |
parent | 4c88ef170f0f9b1f26923b43af526c973c5a74da (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/omap/omapfb_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index db05f7e316e7..7eab0f0b4ccf 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
@@ -1846,8 +1846,8 @@ static int omapfb_suspend(struct platform_device *pdev, pm_message_t mesg) | |||
1846 | { | 1846 | { |
1847 | struct omapfb_device *fbdev = platform_get_drvdata(pdev); | 1847 | struct omapfb_device *fbdev = platform_get_drvdata(pdev); |
1848 | 1848 | ||
1849 | omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]); | 1849 | if (fbdev != NULL) |
1850 | 1850 | omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]); | |
1851 | return 0; | 1851 | return 0; |
1852 | } | 1852 | } |
1853 | 1853 | ||
@@ -1856,7 +1856,8 @@ static int omapfb_resume(struct platform_device *pdev) | |||
1856 | { | 1856 | { |
1857 | struct omapfb_device *fbdev = platform_get_drvdata(pdev); | 1857 | struct omapfb_device *fbdev = platform_get_drvdata(pdev); |
1858 | 1858 | ||
1859 | omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]); | 1859 | if (fbdev != NULL) |
1860 | omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]); | ||
1860 | return 0; | 1861 | return 0; |
1861 | } | 1862 | } |
1862 | 1863 | ||