From 85f8fad733d80cd7f52cdcfaaf22074f8db7632c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat, 27 Oct 2012 16:29:34 -0300
Subject: [PATCH] --- yaml --- r: 343857 b: refs/heads/master c:
 199ab8fed4dcbe86dad74b6ed8733ff4c500e6df h: refs/heads/master i:   343855:
 be52e049400b0ae7b6cd562bf31c9edb4fcade5a v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/usb/s2255/s2255drv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 844a68ca1b20..2671210635e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3e4ea017a414a19ab11a10b52e80a0c8b3f1670
+refs/heads/master: 199ab8fed4dcbe86dad74b6ed8733ff4c500e6df
diff --git a/trunk/drivers/media/usb/s2255/s2255drv.c b/trunk/drivers/media/usb/s2255/s2255drv.c
index 2191f6ddf9e7..8ebec0d7bf59 100644
--- a/trunk/drivers/media/usb/s2255/s2255drv.c
+++ b/trunk/drivers/media/usb/s2255/s2255drv.c
@@ -1651,7 +1651,7 @@ static int vidioc_enum_frameintervals(struct file *file, void *priv,
 	int is_ntsc = 0;
 #define NUM_FRAME_ENUMS 4
 	int frm_dec[NUM_FRAME_ENUMS] = {1, 2, 3, 5};
-	if (fe->index < 0 || fe->index >= NUM_FRAME_ENUMS)
+	if (fe->index >= NUM_FRAME_ENUMS)
 		return -EINVAL;
 	switch (fe->width) {
 	case 640: