---

yaml --- r: 367163 b: refs/heads/master c: 6b1dce2 h: refs/heads/master i: 367161: c142cfe 367159: 440e567 v: v3
git-mirror · Apr 16, 2013 · 168f771 · 168f771
1 parent 8409eee
commit 168f771
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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);