lkml.org 
[lkml]   [2009]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/20] omapfb: suspend/resume only if FB device is already initialized
    Date
    From: Jouni Högander <jouni.hogander@nokia.com>

    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 <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>
    ---
    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 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;
    }

    --
    1.6.3.2
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2009-06-24 13:43    [W:0.029 / U:0.104 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site