rk fb: move fb unrigister from shutdown to driver remove

This commit is contained in:
hjc
2013-10-10 09:10:30 -07:00
parent 37ca06ba09
commit 1ec04b0a98
4 changed files with 8 additions and 4 deletions

2
drivers/video/rockchip/lcdc/rk2928_lcdc.c Normal file → Executable file
View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -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,