Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[deliverable/linux.git] / drivers / media / i2c / adv7180.c

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index 34f39d3b3e3ee4e4bb75c445f273e74aff12ffd0..afd561ab190d50a09789b6adafa92c38bb8294a4 100644 (file)
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -135,6 +135,10 @@ struct adv7180_state {
 
 static v4l2_std_id adv7180_std_to_v4l2(u8 status1)
 {
+       /* in case V4L2_IN_ST_NO_SIGNAL */
+       if (!(status1 & ADV7180_STATUS1_IN_LOCK))
+               return V4L2_STD_UNKNOWN;
+
        switch (status1 & ADV7180_STATUS1_AUTOD_MASK) {
        case ADV7180_STATUS1_AUTOD_NTSM_M_J:
                return V4L2_STD_NTSC;