summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-08-18 07:31:10 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 12:30:32 -0300
commit12500f07c6e179692ae3bd4d7bee9aa07ec74c25 (patch)
tree9233db90a08ad3851a872797f99cd6c3345c869c /drivers
parente738e35d1e9ae15b597c713e0b74e9a535020c0d (diff)
downloadblackbird-op-linux-12500f07c6e179692ae3bd4d7bee9aa07ec74c25.tar.gz
blackbird-op-linux-12500f07c6e179692ae3bd4d7bee9aa07ec74c25.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/tvp5150.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index b167ffab2520..bc0a4fc27b24 100644
--- a/drivers/media/video/tvp5150.c
+++ b/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);
};
OpenPOWER on IntegriCloud