Merge branch 'topic/hda' into for-linus

[pandora-kernel.git] / drivers / media / video / tvp514x.c

diff --git a/drivers/media/video/tvp514x.c b/drivers/media/video/tvp514x.c
index 4262e60..3750f7f 100644 (file)
--- a/drivers/media/video/tvp514x.c
+++ b/drivers/media/video/tvp514x.c
@@ -692,7 +692,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;