summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFancy Fang <chen.fang@freescale.com>2015-09-21 15:37:08 +0800
committerFancy Fang <chen.fang@freescale.com>2015-09-22 14:58:32 +0800
commita48460b41399112f5d3ae03b30e3f9e885346ff7 (patch)
tree62c182037d180f2ebd88e5f8d05b640ea568bb25 /drivers
parentf54c7527895575a2e474b17a4752724977b898ea (diff)
MLK-11594 video: mxsfb: correct the pm runtime logic
The pm power's usage_count should be first added by one before putting it into suspend state. Otherwise the usage_count will be negative and the power cannot be put into suspend state correctly. Signed-off-by: Fancy Fang <chen.fang@freescale.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/mxsfb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 25bdf31efa80..4d38ef35e3d8 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -896,9 +896,7 @@ static int mxsfb_blank(int blank, struct fb_info *fb_info)
case FB_BLANK_NORMAL:
if (host->enabled) {
mxsfb_disable_controller(fb_info);
- pm_runtime_put_noidle(&host->pdev->dev);
pm_runtime_put_sync_suspend(&host->pdev->dev);
- pm_runtime_get_noresume(&host->pdev->dev);
}
clk_disable_disp_axi(host);
@@ -1478,6 +1476,7 @@ static int mxsfb_probe(struct platform_device *pdev)
writel(0, host->base + LCDC_CTRL);
mxsfb_set_par(fb_info);
mxsfb_enable_controller(fb_info);
+ pm_runtime_get_sync(&host->pdev->dev);
}
ret = register_framebuffer(fb_info);