From b443a17cc0b89b3cf26e9133d7d2bc12ad4ab8c4 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Thu, 2 Jul 2009 16:09:25 -0300
Subject: [PATCH] --- yaml --- r: 161427 b: refs/heads/master c:
 de81c3c3f5db3ca35548c54024df50be18d64830 h: refs/heads/master i:   161425:
 485a6ff08f55ba354e7f5bca9859d4e0b40d9ea6   161423:
 7b3acac79e65f876411b8a8190a818dd585a25ed v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/dvb/ttpci/av7110_v4l.c        | 2 +-
 trunk/drivers/media/video/cx18/cx18-ioctl.c       | 2 +-
 trunk/drivers/media/video/saa7134/saa7134-video.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9361cb943d74..539ef50b9c4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce27cd3bf989fe7187526cb120c69bf33b0b68d0
+refs/heads/master: de81c3c3f5db3ca35548c54024df50be18d64830
diff --git a/trunk/drivers/media/dvb/ttpci/av7110_v4l.c b/trunk/drivers/media/dvb/ttpci/av7110_v4l.c
index ce64c6214cc4..8986d967d2f4 100644
--- a/trunk/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/trunk/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -490,7 +490,7 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
 	if (!av7110->analog_tuner_flags)
 		return 0;
 
-	if (input < 0 || input >= 4)
+	if (input >= 4)
 		return -EINVAL;
 
 	av7110->current_input = input;
diff --git a/trunk/drivers/media/video/cx18/cx18-ioctl.c b/trunk/drivers/media/video/cx18/cx18-ioctl.c
index d7b1921e6666..fc76e4d6ffa7 100644
--- a/trunk/drivers/media/video/cx18/cx18-ioctl.c
+++ b/trunk/drivers/media/video/cx18/cx18-ioctl.c
@@ -605,7 +605,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) {
diff --git a/trunk/drivers/media/video/saa7134/saa7134-video.c b/trunk/drivers/media/video/saa7134/saa7134-video.c
index ba87128542e0..bf4c99d19150 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-video.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-video.c
@@ -1790,7 +1790,7 @@ static int saa7134_s_input(struct file *file, void *priv, unsigned int i)
 	if (0 != err)
 		return err;
 
-	if (i < 0  ||  i >= SAA7134_INPUT_MAX)
+	if (i >= SAA7134_INPUT_MAX)
 		return -EINVAL;
 	if (NULL == card_in(dev, i).name)
 		return -EINVAL;