summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-10-24 15:08:28 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-11 08:11:23 -0200
commit8182ff69f8675fc1847a399be4eea5e8118a8dd3 (patch)
treeaf497e6fbd126dd61f61f623a11d221a0ec82a0a /drivers/media/video
parent0d0f1e0a1d6ef2d0ea249930c5ea71d990fc0b6e (diff)
downloadlinux-stable-8182ff69f8675fc1847a399be4eea5e8118a8dd3.tar.gz
linux-stable-8182ff69f8675fc1847a399be4eea5e8118a8dd3.tar.bz2
linux-stable-8182ff69f8675fc1847a399be4eea5e8118a8dd3.zip
V4L/DVB (9372): Minor fixes to the saa7110 driver
* Apparently the author of the saa7110 driver was confused by the number of outputs returned by DECODER_GET_CAPABILITIES. Of course a decoder chip has no analog ouputs, but it must have at least one digital output. * Fix an off-by-one error when checking the input value of DECODER_SET_INPUT. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/saa7110.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index adf2ba79496a..37860698f782 100644
--- a/drivers/media/video/saa7110.c
+++ b/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;
}