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: