From: yzq <yzq@rock-chips.com>
Date: Wed, 24 Oct 2012 06:55:18 +0000 (+0800)
Subject: fix backlight shutdown waring and fix switch screen backlight status
X-Git-Tag: firefly_0821_release~8328
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fdb213ae2c8793cb30c0ee6693a3e7e2c163cd7b;p=firefly-linux-kernel-4.4.55.git

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 55d0804c25fa..cdae8a9332e5 100755
--- 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 476021ffe214..a71f8a75e281 100644
--- 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;