Merge branch 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: video: deferred io cleanup fix for sh_mobile_lcdcfb sh: Add media/soc_camera.h to board setup of Renesas AP325RXA
This commit is contained in:
commit
a651d79979
|
@ -22,6 +22,7 @@
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
#include <linux/spi/spi.h>
|
#include <linux/spi/spi.h>
|
||||||
#include <linux/spi/spi_gpio.h>
|
#include <linux/spi/spi_gpio.h>
|
||||||
|
#include <media/soc_camera.h>
|
||||||
#include <media/soc_camera_platform.h>
|
#include <media/soc_camera_platform.h>
|
||||||
#include <media/sh_mobile_ceu.h>
|
#include <media/sh_mobile_ceu.h>
|
||||||
#include <video/sh_mobile_lcdc.h>
|
#include <video/sh_mobile_lcdc.h>
|
||||||
|
|
|
@ -446,7 +446,6 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv)
|
||||||
{
|
{
|
||||||
struct sh_mobile_lcdc_chan *ch;
|
struct sh_mobile_lcdc_chan *ch;
|
||||||
struct sh_mobile_lcdc_board_cfg *board_cfg;
|
struct sh_mobile_lcdc_board_cfg *board_cfg;
|
||||||
unsigned long tmp;
|
|
||||||
int k;
|
int k;
|
||||||
|
|
||||||
/* tell the board code to disable the panel */
|
/* tell the board code to disable the panel */
|
||||||
|
@ -456,9 +455,8 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv)
|
||||||
if (board_cfg->display_off)
|
if (board_cfg->display_off)
|
||||||
board_cfg->display_off(board_cfg->board_data);
|
board_cfg->display_off(board_cfg->board_data);
|
||||||
|
|
||||||
/* cleanup deferred io if SYS bus */
|
/* cleanup deferred io if enabled */
|
||||||
tmp = ch->cfg.sys_bus_cfg.deferred_io_msec;
|
if (ch->info.fbdefio) {
|
||||||
if (ch->ldmt1r_value & (1 << 12) && tmp) {
|
|
||||||
fb_deferred_io_cleanup(&ch->info);
|
fb_deferred_io_cleanup(&ch->info);
|
||||||
ch->info.fbdefio = NULL;
|
ch->info.fbdefio = NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue