---

yaml
---
r: 271971
b: refs/heads/master
c: e92bcf8
h: refs/heads/master
i:
  271969: cb5e8b7
  271967: 980172a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cb9ccd4612907c0a30de9be1c694672e0cd8933
+refs/heads/master: e92bcf8d8abb654cb916f3e615697320bc6bf1e1

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);