diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-05-02 15:38:47 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:20:58 -0400 |
commit | 223ffe5f8270ba9d069f1cbff9acec095a6f58b1 (patch) | |
tree | c9b7f1288f2b16c9b4466f5a643ec34ac71fbb15 | |
parent | ca19d84295c2579229c5478db8b0f9cd7e821685 (diff) |
V4L/DVB: cleanup redundant tests on unsigned
Remove redundant tests on unsigned.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_v4l.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-av.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cpia2/cpia2_v4l.c | 6 | ||||
-rw-r--r-- | drivers/media/video/hexium_gemini.c | 2 | ||||
-rw-r--r-- | drivers/media/video/hexium_orion.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 2 | ||||
-rw-r--r-- | drivers/media/video/mxb.c | 4 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 4 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-v4l.c | 2 | ||||
-rw-r--r-- | drivers/media/video/stk-webcam.c | 4 | ||||
-rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videobuf-core.c | 4 |
12 files changed, 18 insertions, 18 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c index 2210cff738e6..ce64c6214cc4 100644 --- a/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/drivers/media/dvb/ttpci/av7110_v4l.c | |||
@@ -458,7 +458,7 @@ static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i) | |||
458 | dprintk(2, "VIDIOC_ENUMINPUT: %d\n", i->index); | 458 | dprintk(2, "VIDIOC_ENUMINPUT: %d\n", i->index); |
459 | 459 | ||
460 | if (av7110->analog_tuner_flags) { | 460 | if (av7110->analog_tuner_flags) { |
461 | if (i->index < 0 || i->index >= 4) | 461 | if (i->index >= 4) |
462 | return -EINVAL; | 462 | return -EINVAL; |
463 | } else { | 463 | } else { |
464 | if (i->index != 0) | 464 | if (i->index != 0) |
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c index 855fe74b640b..8ea915227674 100644 --- a/drivers/media/dvb/ttpci/budget-av.c +++ b/drivers/media/dvb/ttpci/budget-av.c | |||
@@ -1413,7 +1413,7 @@ static struct v4l2_input knc1_inputs[KNC1_INPUTS] = { | |||
1413 | static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i) | 1413 | static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i) |
1414 | { | 1414 | { |
1415 | dprintk(1, "VIDIOC_ENUMINPUT %d.\n", i->index); | 1415 | dprintk(1, "VIDIOC_ENUMINPUT %d.\n", i->index); |
1416 | if (i->index < 0 || i->index >= KNC1_INPUTS) | 1416 | if (i->index >= KNC1_INPUTS) |
1417 | return -EINVAL; | 1417 | return -EINVAL; |
1418 | memcpy(i, &knc1_inputs[i->index], sizeof(struct v4l2_input)); | 1418 | memcpy(i, &knc1_inputs[i->index], sizeof(struct v4l2_input)); |
1419 | return 0; | 1419 | return 0; |
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index d4099f5312ac..0b4a8f309cfa 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -1064,7 +1064,7 @@ static int ioctl_querymenu(void *arg,struct camera_data *cam) | |||
1064 | 1064 | ||
1065 | switch(m->id) { | 1065 | switch(m->id) { |
1066 | case CPIA2_CID_FLICKER_MODE: | 1066 | case CPIA2_CID_FLICKER_MODE: |
1067 | if(m->index < 0 || m->index >= NUM_FLICKER_CONTROLS) | 1067 | if (m->index >= NUM_FLICKER_CONTROLS) |
1068 | return -EINVAL; | 1068 | return -EINVAL; |
1069 | 1069 | ||
1070 | strcpy(m->name, flicker_controls[m->index].name); | 1070 | strcpy(m->name, flicker_controls[m->index].name); |
@@ -1082,14 +1082,14 @@ static int ioctl_querymenu(void *arg,struct camera_data *cam) | |||
1082 | maximum = i; | 1082 | maximum = i; |
1083 | } | 1083 | } |
1084 | } | 1084 | } |
1085 | if(m->index < 0 || m->index > maximum) | 1085 | if (m->index > maximum) |
1086 | return -EINVAL; | 1086 | return -EINVAL; |
1087 | 1087 | ||
1088 | strcpy(m->name, framerate_controls[m->index].name); | 1088 | strcpy(m->name, framerate_controls[m->index].name); |
1089 | break; | 1089 | break; |
1090 | } | 1090 | } |
1091 | case CPIA2_CID_LIGHTS: | 1091 | case CPIA2_CID_LIGHTS: |
1092 | if(m->index < 0 || m->index >= NUM_LIGHTS_CONTROLS) | 1092 | if (m->index >= NUM_LIGHTS_CONTROLS) |
1093 | return -EINVAL; | 1093 | return -EINVAL; |
1094 | 1094 | ||
1095 | strcpy(m->name, lights_controls[m->index].name); | 1095 | strcpy(m->name, lights_controls[m->index].name); |
diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c index 8e1463ee1b64..71c211402eb5 100644 --- a/drivers/media/video/hexium_gemini.c +++ b/drivers/media/video/hexium_gemini.c | |||
@@ -224,7 +224,7 @@ static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i) | |||
224 | { | 224 | { |
225 | DEB_EE(("VIDIOC_ENUMINPUT %d.\n", i->index)); | 225 | DEB_EE(("VIDIOC_ENUMINPUT %d.\n", i->index)); |
226 | 226 | ||
227 | if (i->index < 0 || i->index >= HEXIUM_INPUTS) | 227 | if (i->index >= HEXIUM_INPUTS) |
228 | return -EINVAL; | 228 | return -EINVAL; |
229 | 229 | ||
230 | memcpy(i, &hexium_inputs[i->index], sizeof(struct v4l2_input)); | 230 | memcpy(i, &hexium_inputs[i->index], sizeof(struct v4l2_input)); |
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c index 2bc39f628455..39d65ca41c62 100644 --- a/drivers/media/video/hexium_orion.c +++ b/drivers/media/video/hexium_orion.c | |||
@@ -325,7 +325,7 @@ static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i) | |||
325 | { | 325 | { |
326 | DEB_EE(("VIDIOC_ENUMINPUT %d.\n", i->index)); | 326 | DEB_EE(("VIDIOC_ENUMINPUT %d.\n", i->index)); |
327 | 327 | ||
328 | if (i->index < 0 || i->index >= HEXIUM_INPUTS) | 328 | if (i->index >= HEXIUM_INPUTS) |
329 | return -EINVAL; | 329 | return -EINVAL; |
330 | 330 | ||
331 | memcpy(i, &hexium_inputs[i->index], sizeof(struct v4l2_input)); | 331 | memcpy(i, &hexium_inputs[i->index], sizeof(struct v4l2_input)); |
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index c342a9fe983e..99f3c39a118b 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c | |||
@@ -709,7 +709,7 @@ static int ivtv_itvc(struct ivtv *itv, unsigned int cmd, void *arg) | |||
709 | else if (itv->has_cx23415 && regs->reg >= IVTV_DECODER_OFFSET && | 709 | else if (itv->has_cx23415 && regs->reg >= IVTV_DECODER_OFFSET && |
710 | regs->reg < IVTV_DECODER_OFFSET + IVTV_DECODER_SIZE) | 710 | regs->reg < IVTV_DECODER_OFFSET + IVTV_DECODER_SIZE) |
711 | reg_start = itv->dec_mem - IVTV_DECODER_OFFSET; | 711 | reg_start = itv->dec_mem - IVTV_DECODER_OFFSET; |
712 | else if (regs->reg >= 0 && regs->reg < IVTV_ENCODER_SIZE) | 712 | else if (regs->reg < IVTV_ENCODER_SIZE) |
713 | reg_start = itv->enc_mem; | 713 | reg_start = itv->enc_mem; |
714 | else | 714 | else |
715 | return -EINVAL; | 715 | return -EINVAL; |
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c index 3be5a71bdac2..35890e8b2431 100644 --- a/drivers/media/video/mxb.c +++ b/drivers/media/video/mxb.c | |||
@@ -453,7 +453,7 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *vc) | |||
453 | static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i) | 453 | static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i) |
454 | { | 454 | { |
455 | DEB_EE(("VIDIOC_ENUMINPUT %d.\n", i->index)); | 455 | DEB_EE(("VIDIOC_ENUMINPUT %d.\n", i->index)); |
456 | if (i->index < 0 || i->index >= MXB_INPUTS) | 456 | if (i->index >= MXB_INPUTS) |
457 | return -EINVAL; | 457 | return -EINVAL; |
458 | memcpy(i, &mxb_inputs[i->index], sizeof(struct v4l2_input)); | 458 | memcpy(i, &mxb_inputs[i->index], sizeof(struct v4l2_input)); |
459 | return 0; | 459 | return 0; |
@@ -616,7 +616,7 @@ static int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *a) | |||
616 | struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; | 616 | struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; |
617 | struct mxb *mxb = (struct mxb *)dev->ext_priv; | 617 | struct mxb *mxb = (struct mxb *)dev->ext_priv; |
618 | 618 | ||
619 | if (a->index < 0 || a->index > MXB_INPUTS) { | 619 | if (a->index > MXB_INPUTS) { |
620 | DEB_D(("VIDIOC_G_AUDIO %d out of range.\n", a->index)); | 620 | DEB_D(("VIDIOC_G_AUDIO %d out of range.\n", a->index)); |
621 | return -EINVAL; | 621 | return -EINVAL; |
622 | } | 622 | } |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 9e0f2b07b93b..24b3c1d94980 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -267,7 +267,7 @@ static long pvr2_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
267 | memset(&tmp,0,sizeof(tmp)); | 267 | memset(&tmp,0,sizeof(tmp)); |
268 | tmp.index = vi->index; | 268 | tmp.index = vi->index; |
269 | ret = 0; | 269 | ret = 0; |
270 | if ((vi->index < 0) || (vi->index >= fh->input_cnt)) { | 270 | if (vi->index >= fh->input_cnt) { |
271 | ret = -EINVAL; | 271 | ret = -EINVAL; |
272 | break; | 272 | break; |
273 | } | 273 | } |
@@ -331,7 +331,7 @@ static long pvr2_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
331 | case VIDIOC_S_INPUT: | 331 | case VIDIOC_S_INPUT: |
332 | { | 332 | { |
333 | struct v4l2_input *vi = (struct v4l2_input *)arg; | 333 | struct v4l2_input *vi = (struct v4l2_input *)arg; |
334 | if ((vi->index < 0) || (vi->index >= fh->input_cnt)) { | 334 | if (vi->index >= fh->input_cnt) { |
335 | ret = -ERANGE; | 335 | ret = -ERANGE; |
336 | break; | 336 | break; |
337 | } | 337 | } |
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c index bc0a464295c5..2876ce084510 100644 --- a/drivers/media/video/pwc/pwc-v4l.c +++ b/drivers/media/video/pwc/pwc-v4l.c | |||
@@ -1107,7 +1107,7 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
1107 | return -EINVAL; | 1107 | return -EINVAL; |
1108 | if (buf->memory != V4L2_MEMORY_MMAP) | 1108 | if (buf->memory != V4L2_MEMORY_MMAP) |
1109 | return -EINVAL; | 1109 | return -EINVAL; |
1110 | if (buf->index < 0 || buf->index >= pwc_mbufs) | 1110 | if (buf->index >= pwc_mbufs) |
1111 | return -EINVAL; | 1111 | return -EINVAL; |
1112 | 1112 | ||
1113 | buf->flags |= V4L2_BUF_FLAG_QUEUED; | 1113 | buf->flags |= V4L2_BUF_FLAG_QUEUED; |
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index 1a6d39cbd6f3..2e5937047278 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
@@ -1137,7 +1137,7 @@ static int stk_vidioc_querybuf(struct file *filp, | |||
1137 | struct stk_camera *dev = priv; | 1137 | struct stk_camera *dev = priv; |
1138 | struct stk_sio_buffer *sbuf; | 1138 | struct stk_sio_buffer *sbuf; |
1139 | 1139 | ||
1140 | if (buf->index < 0 || buf->index >= dev->n_sbufs) | 1140 | if (buf->index >= dev->n_sbufs) |
1141 | return -EINVAL; | 1141 | return -EINVAL; |
1142 | sbuf = dev->sio_bufs + buf->index; | 1142 | sbuf = dev->sio_bufs + buf->index; |
1143 | *buf = sbuf->v4lbuf; | 1143 | *buf = sbuf->v4lbuf; |
@@ -1154,7 +1154,7 @@ static int stk_vidioc_qbuf(struct file *filp, | |||
1154 | if (buf->memory != V4L2_MEMORY_MMAP) | 1154 | if (buf->memory != V4L2_MEMORY_MMAP) |
1155 | return -EINVAL; | 1155 | return -EINVAL; |
1156 | 1156 | ||
1157 | if (buf->index < 0 || buf->index >= dev->n_sbufs) | 1157 | if (buf->index >= dev->n_sbufs) |
1158 | return -EINVAL; | 1158 | return -EINVAL; |
1159 | sbuf = dev->sio_bufs + buf->index; | 1159 | sbuf = dev->sio_bufs + buf->index; |
1160 | if (sbuf->v4lbuf.flags & V4L2_BUF_FLAG_QUEUED) | 1160 | if (sbuf->v4lbuf.flags & V4L2_BUF_FLAG_QUEUED) |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index d7056a5b7f9b..d03e5922d3b8 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -541,7 +541,7 @@ static int vidioc_enum_input (struct file *file, void *priv, | |||
541 | struct usb_usbvision *usbvision = video_drvdata(file); | 541 | struct usb_usbvision *usbvision = video_drvdata(file); |
542 | int chan; | 542 | int chan; |
543 | 543 | ||
544 | if ((vi->index >= usbvision->video_inputs) || (vi->index < 0) ) | 544 | if (vi->index >= usbvision->video_inputs) |
545 | return -EINVAL; | 545 | return -EINVAL; |
546 | if (usbvision->have_tuner) { | 546 | if (usbvision->have_tuner) { |
547 | chan = vi->index; | 547 | chan = vi->index; |
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index 29b3c693a8e4..48c3ebdb415f 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c | |||
@@ -455,7 +455,7 @@ int videobuf_querybuf(struct videobuf_queue *q, struct v4l2_buffer *b) | |||
455 | dprintk(1, "querybuf: Wrong type.\n"); | 455 | dprintk(1, "querybuf: Wrong type.\n"); |
456 | goto done; | 456 | goto done; |
457 | } | 457 | } |
458 | if (unlikely(b->index < 0 || b->index >= VIDEO_MAX_FRAME)) { | 458 | if (unlikely(b->index >= VIDEO_MAX_FRAME)) { |
459 | dprintk(1, "querybuf: index out of range.\n"); | 459 | dprintk(1, "querybuf: index out of range.\n"); |
460 | goto done; | 460 | goto done; |
461 | } | 461 | } |
@@ -496,7 +496,7 @@ int videobuf_qbuf(struct videobuf_queue *q, | |||
496 | dprintk(1, "qbuf: Wrong type.\n"); | 496 | dprintk(1, "qbuf: Wrong type.\n"); |
497 | goto done; | 497 | goto done; |
498 | } | 498 | } |
499 | if (b->index < 0 || b->index >= VIDEO_MAX_FRAME) { | 499 | if (b->index >= VIDEO_MAX_FRAME) { |
500 | dprintk(1, "qbuf: index out of range.\n"); | 500 | dprintk(1, "qbuf: index out of range.\n"); |
501 | goto done; | 501 | goto done; |
502 | } | 502 | } |