From e11a504fd34d741ac262e07ea1a1552ace2e4f59 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@kernellabs.com>
Date: Mon, 10 Oct 2011 11:09:55 -0300
Subject: [PATCH] --- yaml --- r: 271971 b: refs/heads/master c:
 e92bcf8d8abb654cb916f3e615697320bc6bf1e1 h: refs/heads/master i:   271969:
 cb5e8b7391e02fc3a1393eabb74424761f99f910   271967:
 980172ac1ac27ee12344886630fa434bf6846596 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/cx23885/cx23885-video.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aa56315ea979..4a1cf0cde7f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cb9ccd4612907c0a30de9be1c694672e0cd8933
+refs/heads/master: e92bcf8d8abb654cb916f3e615697320bc6bf1e1
diff --git a/trunk/drivers/media/video/cx23885/cx23885-video.c b/trunk/drivers/media/video/cx23885/cx23885-video.c
index f13c40e653c1..596b46e7bc51 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-video.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-video.c
@@ -1239,7 +1239,7 @@ static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
 	dprintk(1, "%s()\n", __func__);
 
 	n = i->index;
-	if (n >= 4)
+	if (n >= MAX_CX23885_INPUT)
 		return -EINVAL;
 
 	if (0 == INPUT(n)->type)
@@ -1279,11 +1279,14 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
 
 	dprintk(1, "%s(%d)\n", __func__, i);
 
-	if (i >= 4) {
+	if (i >= MAX_CX23885_INPUT) {
 		dprintk(1, "%s() -EINVAL\n", __func__);
 		return -EINVAL;
 	}
 
+	if (INPUT(i)->type == 0)
+		return -EINVAL;
+
 	mutex_lock(&dev->lock);
 	cx23885_video_mux(dev, i);
 	mutex_unlock(&dev->lock);