diff --git a/[refs] b/[refs]
index 2cda8d3d7cf6..5b74f5f414e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e23b290716ad9355d9f17b569c8c9e659ff68aa7
+refs/heads/master: 320a46485c83e70e374afa8bdfe8cd39a801cd5d
diff --git a/trunk/drivers/media/video/tvp514x.c b/trunk/drivers/media/video/tvp514x.c
index 8e23aa53c29a..5f4cbc2b23c1 100644
--- a/trunk/drivers/media/video/tvp514x.c
+++ b/trunk/drivers/media/video/tvp514x.c
@@ -686,7 +686,7 @@ static int ioctl_s_routing(struct v4l2_int_device *s,
 			break;	/* Input detected */
 	}
 
-	if ((current_std == STD_INVALID) || (try_count < 0))
+	if ((current_std == STD_INVALID) || (try_count <= 0))
 		return -EINVAL;
 
 	decoder->current_std = current_std;