[17/20] omapfb: suspend/resume only if FB device is already initialized

Commit Message

Imre Deak June 4, 2009, 5:52 p.m. UTC

From: Jouni Högander <[e-mail]>

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 Högander <[e-mail]>
Signed-off-by: Tony Lindgren <[e-mail]>
Signed-off-by: Imre Deak <[e-mail]>
---
 drivers/video/omap/omapfb_main.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

Comments

Krzysztof Helt June 14, 2009, 9:42 p.m. UTC | #1

On Thu,  4 Jun 2009 20:52:42 +0300
Imre Deak <[e-mail]> wrote:

> From: Jouni Högander <[e-mail]>
> 
> 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 Högander <[e-mail]>
> Signed-off-by: Tony Lindgren <[e-mail]>
> Signed-off-by: Imre Deak <[e-mail]>
> ---
>  drivers/video/omap/omapfb_main.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 

Acked-by: Krzysztof Helt <[e-mail]>


----------------------------------------------------------------------
Zostan dziennikarzem obywatelskim!
Sprawd¼ sie >>> http://link.interia.pl/f21b9

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 5b04b9c..098177b 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -1842,8 +1842,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;
 }
 
@@ -1852,7 +1852,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;
 }