fix backlight shutdown waring and fix switch screen backlight status

diff --git a/drivers/video/backlight/rk29_backlight.c b/drivers/video/backlight/rk29_backlight.c
index 55d0804c25fac32d01057a57b4d51047444aed0c..cdae8a9332e55822dfcb3deeeb8ea27efb8d91ef 100755 (executable)
--- a/drivers/video/backlight/rk29_backlight.c
+++ b/drivers/video/backlight/rk29_backlight.c
@@ -357,9 +357,6 @@ static void rk29_backlight_shutdown(struct platform_device *pdev)
        rk29_bl->props.brightness = 0;
        rk29_bl_update_status(rk29_bl);
 
-       if (rk29_bl_info && rk29_bl_info->pwm_suspend)
-               rk29_bl_info->pwm_suspend();
-
        if (rk29_bl_info && rk29_bl_info->io_deinit)
                rk29_bl_info->io_deinit();
 }

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 476021ffe2149e70ba9a280f14099b46d1dbd00c..a71f8a75e2818eee99158a744bcad8b911af3275 100644 (file)
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -761,7 +761,8 @@ int rk_fb_switch_screen(rk_screen *screen ,int enable ,int lcdc_id)
 #if defined(CONFIG_NO_DUAL_DISP)  //close backlight for device whic do not support dual display
        rk29_backlight_set(!enable);
 #elif defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF)  //close backlight for device whic do not support dual display
-       rk29_backlight_set(1);
+       if(enable)
+               rk29_backlight_set(1);
 #endif
        return 0;