From: hjc <hjc@rock-chips.com>
Date: Thu, 10 Oct 2013 16:10:30 +0000 (-0700)
Subject: rk fb: move fb unrigister from shutdown to driver remove
X-Git-Tag: firefly_0821_release~6576
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ec04b0a98a3e03e46903a7c7edf40177dd15ec6;p=firefly-linux-kernel-4.4.55.git

rk fb: move fb unrigister from shutdown to driver remove
---

diff --git a/drivers/video/rockchip/lcdc/rk2928_lcdc.c b/drivers/video/rockchip/lcdc/rk2928_lcdc.c
old mode 100644
new mode 100755
index 414c45be9064..561fa6866a3a
--- a/drivers/video/rockchip/lcdc/rk2928_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk2928_lcdc.c
@@ -1382,7 +1382,7 @@ static void rk2928_lcdc_shutdown(struct platform_device *pdev)
 		lcdc_dev->driver.screen_ctr_info->io_disable();
 	if(lcdc_dev->driver.cur_screen->sscreen_set) //turn off  lvds
 		lcdc_dev->driver.cur_screen->sscreen_set(lcdc_dev->driver.cur_screen , 0);
-	rk_fb_unregister(&(lcdc_dev->driver));
+	//rk_fb_unregister(&(lcdc_dev->driver));
 	rk2928_lcdc_deinit(lcdc_dev);
 	/*iounmap(lcdc_dev->reg_vir_base);
 	release_mem_region(lcdc_dev->reg_phy_base,lcdc_dev->len);
diff --git a/drivers/video/rockchip/lcdc/rk3066b_lcdc.c b/drivers/video/rockchip/lcdc/rk3066b_lcdc.c
index 64b6298f4b28..44fc4279a02c 100755
--- a/drivers/video/rockchip/lcdc/rk3066b_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3066b_lcdc.c
@@ -1479,7 +1479,7 @@ static void rk3066b_lcdc_shutdown(struct platform_device *pdev)
 		lcdc_dev->driver.cur_screen->sscreen_set(lcdc_dev->driver.cur_screen , 0);
 
 	rk3066b_lcdc_deinit(lcdc_dev);
-	rk_fb_unregister(&(lcdc_dev->driver));
+	//rk_fb_unregister(&(lcdc_dev->driver));
 	
 	/*iounmap(lcdc_dev->reg_vir_base);
 	release_mem_region(lcdc_dev->reg_phy_base,lcdc_dev->len);
diff --git a/drivers/video/rockchip/lcdc/rk30_lcdc.c b/drivers/video/rockchip/lcdc/rk30_lcdc.c
index cf8c1939f626..7b7b79010d8d 100755
--- a/drivers/video/rockchip/lcdc/rk30_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk30_lcdc.c
@@ -1708,7 +1708,7 @@ static void rk30_lcdc_shutdown(struct platform_device *pdev)
 	if(lcdc_dev->driver.cur_screen->sscreen_set) //turn off  lvds if necessary
 		lcdc_dev->driver.cur_screen->sscreen_set(lcdc_dev->driver.cur_screen , 0);
 	rk30_lcdc_deinit(lcdc_dev);
-	rk_fb_unregister(&(lcdc_dev->driver));
+	//rk_fb_unregister(&(lcdc_dev->driver));
 	
 	/*iounmap(lcdc_dev->reg_vir_base);
 	release_mem_region(lcdc_dev->reg_phy_base,lcdc_dev->len);
diff --git a/drivers/video/rockchip/lcdc/rk3188_lcdc.c b/drivers/video/rockchip/lcdc/rk3188_lcdc.c
index 29bd5156ccf8..36fbf32e58b6 100755
--- a/drivers/video/rockchip/lcdc/rk3188_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3188_lcdc.c
@@ -1711,6 +1711,10 @@ err0:
 
 static int __devexit rk3188_lcdc_remove(struct platform_device *pdev)
 {
+	struct rk3188_lcdc_device *lcdc_dev = platform_get_drvdata(pdev);
+	rk3188_lcdc_deint(lcdc_dev);	
+	rk_fb_unregister(&(lcdc_dev->driver));
+
 	return 0;
 }
 
@@ -1722,7 +1726,7 @@ static void rk3188_lcdc_shutdown(struct platform_device *pdev)
 	if(lcdc_dev->driver.screen_ctr_info->io_disable) //power off the screen if necessary
 		lcdc_dev->driver.screen_ctr_info->io_disable();
 	rk3188_lcdc_deint(lcdc_dev);
-	rk_fb_unregister(&(lcdc_dev->driver));	
+	//rk_fb_unregister(&(lcdc_dev->driver));	
 }
 static struct platform_driver rk3188_lcdc_driver = {
 	.probe		= rk3188_lcdc_probe,