diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-20 16:56:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-20 16:56:09 -0800 |
| commit | d0708b9739f4d184f74ef69fb15d9c26aecb3f10 (patch) | |
| tree | 7f96764d40111a29688e2b11551b7433889381b9 /drivers/media/video/mt9t112.c | |
| parent | c52042ba5cd2071d9a69972d71997144d236e962 (diff) | |
| parent | 2434466432464110b5307757e0285dd41f15512e (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB: bttv: Move I2C IR initialization
V4L/DVB: Video : pwc : Fix regression in pwc_set_shutter_speed caused by bad constant => sizeof conversion.
soc-camera: mt9t112: modify exiting conditions from standby mode
V4L/DVB: cxusb: Select all required frontend and tuner modules
V4L/DVB: dvb: l64781.ko broken with gcc 4.5
Diffstat (limited to 'drivers/media/video/mt9t112.c')
| -rw-r--r-- | drivers/media/video/mt9t112.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/mt9t112.c b/drivers/media/video/mt9t112.c index fc4dd604572..7438f8d775b 100644 --- a/drivers/media/video/mt9t112.c +++ b/drivers/media/video/mt9t112.c @@ -514,7 +514,7 @@ static int mt9t112_init_pll(const struct i2c_client *client) /* poll to verify out of standby. Must Poll this bit */ for (i = 0; i < 100; i++) { mt9t112_reg_read(data, client, 0x0018); - if (0x4000 & data) + if (!(0x4000 & data)) break; mdelay(10); |