diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-05 18:58:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-05 18:58:38 -0300 |
| commit | 59ad1e534e569f743df108421f369cbf915f2e6e (patch) | |
| tree | 7a3a0177c072cc3fc8b4ff5204e7065d7971115c /linux/drivers/media/video/cx18 | |
| parent | 9cc45cab6319967ccacdcb3b8c848ec555941200 (diff) | |
| parent | 21ffe960decd954bf2e0959e5d85ec5484477bbd (diff) | |
| download | mediapointer-dvb-s2-59ad1e534e569f743df108421f369cbf915f2e6e.tar.gz mediapointer-dvb-s2-59ad1e534e569f743df108421f369cbf915f2e6e.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-fileops.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-ioctl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-fileops.c b/linux/drivers/media/video/cx18/cx18-fileops.c index 817bb9263..227c99f24 100644 --- a/linux/drivers/media/video/cx18/cx18-fileops.c +++ b/linux/drivers/media/video/cx18/cx18-fileops.c @@ -726,7 +726,7 @@ int cx18_v4l2_open(struct file *filp) int res; struct video_device *video_dev = video_devdata(filp); struct cx18_stream *s = video_get_drvdata(video_dev); - struct cx18 *cx = s->cx;; + struct cx18 *cx = s->cx; mutex_lock(&cx->serialize_lock); if (cx18_init_on_first_open(cx)) { diff --git a/linux/drivers/media/video/cx18/cx18-ioctl.c b/linux/drivers/media/video/cx18/cx18-ioctl.c index 65e2ef425..107b57880 100644 --- a/linux/drivers/media/video/cx18/cx18-ioctl.c +++ b/linux/drivers/media/video/cx18/cx18-ioctl.c @@ -613,7 +613,7 @@ int cx18_s_input(struct file *file, void *fh, unsigned int inp) if (ret) return ret; - if (inp < 0 || inp >= cx->nof_inputs) + if (inp >= cx->nof_inputs) return -EINVAL; if (inp == cx->active_input) { |