diff --git a/[refs] b/[refs]
index 60a3e3da5a7f..63886f2089af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d0f1e0a1d6ef2d0ea249930c5ea71d990fc0b6e
+refs/heads/master: 8182ff69f8675fc1847a399be4eea5e8118a8dd3
diff --git a/trunk/drivers/media/video/saa7110.c b/trunk/drivers/media/video/saa7110.c
index adf2ba79496a..37860698f782 100644
--- a/trunk/drivers/media/video/saa7110.c
+++ b/trunk/drivers/media/video/saa7110.c
@@ -47,7 +47,7 @@ module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 #define SAA7110_MAX_INPUT	9	/* 6 CVBS, 3 SVHS */
-#define SAA7110_MAX_OUTPUT	0	/* its a decoder only */
+#define SAA7110_MAX_OUTPUT	1	/* 1 YUV */
 
 #define SAA7110_NR_REG		0x35
 
@@ -327,7 +327,7 @@ saa7110_command (struct i2c_client *client,
 
 	case DECODER_SET_INPUT:
 		v = *(int *) arg;
-		if (v < 0 || v > SAA7110_MAX_INPUT) {
+		if (v < 0 || v >= SAA7110_MAX_INPUT) {
 			v4l_dbg(1, debug, client, "input=%d not available\n", v);
 			return -EINVAL;
 		}