Commit 12500f07 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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



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

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent e738e35d
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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);
};