diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 02:25:18 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 02:25:18 -0400 |
| commit | 74aaf024c9a4def24f3eb91a675e4712142d3c87 (patch) | |
| tree | 87151eb8253da9d98851ce5756d97c7cfa9c4e97 /drivers | |
| parent | e161183ba674f97fce748384f5bb037d07bdc5c9 (diff) | |
| parent | 467fc4988986865b5dbcc8cc6a86c9b650cb0c6f (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 0e2b8fd24df1..2c5d069e5f06 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
| @@ -446,7 +446,6 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv) | |||
| 446 | { | 446 | { |
| 447 | struct sh_mobile_lcdc_chan *ch; | 447 | struct sh_mobile_lcdc_chan *ch; |
| 448 | struct sh_mobile_lcdc_board_cfg *board_cfg; | 448 | struct sh_mobile_lcdc_board_cfg *board_cfg; |
| 449 | unsigned long tmp; | ||
| 450 | int k; | 449 | int k; |
| 451 | 450 | ||
| 452 | /* tell the board code to disable the panel */ | 451 | /* tell the board code to disable the panel */ |
| @@ -456,9 +455,8 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv) | |||
| 456 | if (board_cfg->display_off) | 455 | if (board_cfg->display_off) |
| 457 | board_cfg->display_off(board_cfg->board_data); | 456 | board_cfg->display_off(board_cfg->board_data); |
| 458 | 457 | ||
| 459 | /* cleanup deferred io if SYS bus */ | 458 | /* cleanup deferred io if enabled */ |
| 460 | tmp = ch->cfg.sys_bus_cfg.deferred_io_msec; | 459 | if (ch->info.fbdefio) { |
| 461 | if (ch->ldmt1r_value & (1 << 12) && tmp) { | ||
| 462 | fb_deferred_io_cleanup(&ch->info); | 460 | fb_deferred_io_cleanup(&ch->info); |
| 463 | ch->info.fbdefio = NULL; | 461 | ch->info.fbdefio = NULL; |
| 464 | } | 462 | } |