diff options
| author | Magnus Damm <damm@igel.co.jp> | 2009-08-15 02:53:16 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 12:58:42 +0900 |
| commit | 21bc1f024d0d4ea43fc0f2a43504e759261c7b18 (patch) | |
| tree | 2f02505203363e007d114e180ff799ed8223ccce /drivers/video | |
| parent | 64f1607ffbbc772685733ea63e6f7f4183df1b16 (diff) | |
| download | linux-3.10-21bc1f024d0d4ea43fc0f2a43504e759261c7b18.tar.gz linux-3.10-21bc1f024d0d4ea43fc0f2a43504e759261c7b18.tar.bz2 linux-3.10-21bc1f024d0d4ea43fc0f2a43504e759261c7b18.zip | |
sh: skip disabled LCDC channels
This patch updates the SuperH Mobile LCDC driver to skip
over disabled channels. Without this patch suspend-to-ram
operation will crash if deferred io is enabled.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video')
| -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 8f24564f77b..07f22b62563 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -481,6 +481,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); @@ -498,6 +501,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 |