Merge branch 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: video: stop sh_mobile_lcdcfb only if started sh: ap325 camera without i2c driver fix
This commit is contained in:
commit
66a26a8fa7
|
@ -263,6 +263,9 @@ static int camera_probe(void)
|
|||
struct i2c_msg msg;
|
||||
int ret;
|
||||
|
||||
if (!a)
|
||||
return -ENODEV;
|
||||
|
||||
camera_power(1);
|
||||
msg.addr = 0x6e;
|
||||
msg.buf = camera_ncm03j_magic;
|
||||
|
|
|
@ -47,6 +47,7 @@ struct sh_mobile_lcdc_priv {
|
|||
#endif
|
||||
unsigned long lddckr;
|
||||
struct sh_mobile_lcdc_chan ch[2];
|
||||
int started;
|
||||
};
|
||||
|
||||
/* shared registers */
|
||||
|
@ -451,6 +452,7 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
|
|||
|
||||
/* start the lcdc */
|
||||
sh_mobile_lcdc_start_stop(priv, 1);
|
||||
priv->started = 1;
|
||||
|
||||
/* tell the board code to enable the panel */
|
||||
for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
|
||||
|
@ -493,7 +495,10 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv)
|
|||
}
|
||||
|
||||
/* stop the lcdc */
|
||||
if (priv->started) {
|
||||
sh_mobile_lcdc_start_stop(priv, 0);
|
||||
priv->started = 0;
|
||||
}
|
||||
|
||||
/* stop clocks */
|
||||
for (k = 0; k < ARRAY_SIZE(priv->ch); k++)
|
||||
|
|
Loading…
Reference in a new issue