Skip to content

Commit

Permalink
V4L/DVB (9372): Minor fixes to the saa7110 driver
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
Jean Delvare authored and Mauro Carvalho Chehab committed Nov 11, 2008
1 parent 0d0f1e0 commit 8182ff6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/saa7110.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 8182ff6

Please sign in to comment.