Browse Source

V4L/DVB (4506): TVP5150 routing logic were broken.

As pointed by The Coverity checker, commit
c7c0b34c27bbf0671807e902fbfea6270c8f138d broked input selection.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab 19 years ago
parent
commit
12500f07c6
1 changed files with 6 additions and 1 deletions
  1. 6 1
      drivers/media/video/tvp5150.c

+ 6 - 1
drivers/media/video/tvp5150.c

@@ -294,7 +294,7 @@ static inline void tvp5150_selmux(struct i2c_client *c)
 	if ((decoder->route.output & TVP5150_BLACK_SCREEN) || !decoder->enable)
 		input = 8;
 
-	switch (input) {
+	switch (decoder->route.input) {
 	case TVP5150_COMPOSITE1:
 		input |= 2;
 		/* fall through */
@@ -308,6 +308,11 @@ static inline void tvp5150_selmux(struct i2c_client *c)
 		break;
 	}
 
+	tvp5150_dbg( 1, "Selecting video route: route input=%i, output=%i "
+			"=> tvp5150 input=%i, opmode=%i\n",
+			decoder->route.input,decoder->route.output,
+			input, opmode );
+
 	tvp5150_write(c, TVP5150_OP_MODE_CTL, opmode);
 	tvp5150_write(c, TVP5150_VD_IN_SRC_SEL_1, input);
 };