From 168f7711ffe760224c4bd9ed485e9a8501571c2d Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Sat, 13 Apr 2013 07:39:19 -0300
Subject: [PATCH] --- yaml --- r: 367163 b: refs/heads/master c:
 6b1dce251fa21caea4e0021fd3fd0d8dcdece784 h: refs/heads/master i:   367161:
 c142cfeb765f934c80fc1e602772f26093edfa99   367159:
 440e567377203174499a2c0e809621a9ada6f78e v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/pci/cx25821/cx25821-video.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f81ec55cb7ae..50f852db2368 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8f35ce3d6f5b776463f03403e0319c2415401f7
+refs/heads/master: 6b1dce251fa21caea4e0021fd3fd0d8dcdece784
diff --git a/trunk/drivers/media/pci/cx25821/cx25821-video.c b/trunk/drivers/media/pci/cx25821/cx25821-video.c
index a9aa09651cab..9ddc7ac03a73 100644
--- a/trunk/drivers/media/pci/cx25821/cx25821-video.c
+++ b/trunk/drivers/media/pci/cx25821/cx25821-video.c
@@ -1163,10 +1163,8 @@ int cx25821_vidioc_s_input(struct file *file, void *priv, unsigned int i)
 			return err;
 	}
 
-	if (i >= CX25821_NR_INPUT) {
-		dprintk(1, "%s(): -EINVAL\n", __func__);
+	if (i >= CX25821_NR_INPUT || INPUT(i)->type == 0)
 		return -EINVAL;
-	}
 
 	mutex_lock(&dev->lock);
 	cx25821_video_mux(dev, i);