diff --git a/[refs] b/[refs]
index 7f14aaea30d8..827d1cba9e7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61ff5d69dc39fecfe52ee5c8d4695a0ad4444d34
+refs/heads/master: b294a1921454fbcc6e983750ae977ce8a28f31bc
diff --git a/trunk/drivers/media/i2c/adv7180.c b/trunk/drivers/media/i2c/adv7180.c
index 34f39d3b3e3e..afd561ab190d 100644
--- a/trunk/drivers/media/i2c/adv7180.c
+++ b/trunk/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;