diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 05:59:42 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 05:59:42 +0200 |
| commit | 60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d (patch) | |
| tree | b19755368b6d0f6be3024d972de13f4b48cb025d /drivers/video/sh_mobile_lcdcfb.c | |
| parent | sh: Set the cfa_offset to 0 if we see a DW_CFA_def_cfa_register op (diff) | |
| parent | sh: sh7724 ddr self-refresh changes (diff) | |
| download | linux-60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d.tar.xz linux-60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d.zip | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'drivers/video/sh_mobile_lcdcfb.c')
| -rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index cff406de3d15..fc3f9662ceae 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -477,6 +477,9 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv) /* tell the board code to enable the panel */ for (k = 0; k < ARRAY_SIZE(priv->ch); k++) { ch = &priv->ch[k]; + if (!ch->enabled) + continue; + board_cfg = &ch->cfg.board_cfg; if (board_cfg->display_on) board_cfg->display_on(board_cfg->board_data); @@ -494,6 +497,8 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv) /* clean up deferred io and ask board code to disable panel */ for (k = 0; k < ARRAY_SIZE(priv->ch); k++) { ch = &priv->ch[k]; + if (!ch->enabled) + continue; /* deferred io mode: * flush frame, and wait for frame end interrupt |