aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/da8xx-fb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/da8xx-fb.c')
-rw-r--r--drivers/video/da8xx-fb.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index e81a4585902b..ca9943aae83b 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -1038,10 +1038,10 @@ static int cfb_blank(int blank, struct fb_info *info)
1038 par->blank = blank; 1038 par->blank = blank;
1039 switch (blank) { 1039 switch (blank) {
1040 case FB_BLANK_UNBLANK: 1040 case FB_BLANK_UNBLANK:
1041 lcd_enable_raster();
1042
1041 if (par->panel_power_ctrl) 1043 if (par->panel_power_ctrl)
1042 par->panel_power_ctrl(1); 1044 par->panel_power_ctrl(1);
1043
1044 lcd_enable_raster();
1045 break; 1045 break;
1046 case FB_BLANK_NORMAL: 1046 case FB_BLANK_NORMAL:
1047 case FB_BLANK_VSYNC_SUSPEND: 1047 case FB_BLANK_VSYNC_SUSPEND:
@@ -1422,11 +1422,12 @@ static int fb_resume(struct platform_device *dev)
1422 struct da8xx_fb_par *par = info->par; 1422 struct da8xx_fb_par *par = info->par;
1423 1423
1424 console_lock(); 1424 console_lock();
1425 clk_enable(par->lcdc_clk);
1426 lcd_enable_raster();
1427
1425 if (par->panel_power_ctrl) 1428 if (par->panel_power_ctrl)
1426 par->panel_power_ctrl(1); 1429 par->panel_power_ctrl(1);
1427 1430
1428 clk_enable(par->lcdc_clk);
1429 lcd_enable_raster();
1430 fb_set_suspend(info, 0); 1431 fb_set_suspend(info, 0);
1431 console_unlock(); 1432 console_unlock();
1432 1433