summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-09 08:38:47 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-29 08:35:37 -0200
commit3e478c06e83efc365e8351bff7b4c569f22e642d (patch)
tree80352cb99aed4aa63660f87dfe4a6f30e4047042 /drivers/media/video
parentdbdf03b48bd32150b4023ea0dd22f566958b6294 (diff)
downloadop-kernel-dev-3e478c06e83efc365e8351bff7b4c569f22e642d.zip
op-kernel-dev-3e478c06e83efc365e8351bff7b4c569f22e642d.tar.gz
V4L/DVB (10209): tveeprom: Properly initialize tuner type (BZ#11367)
If Hauppauge eeprom is corrupted, the driver returns tuner = 0, instead of TUNER_ABSENT. This makes the drivers to initialize tuner, instead of handling the manual parameter. Since the tuner core rejects that a tuner to have their type changed, this breaks the manual tuner override. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/tveeprom.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 3b0b84c..78277ab 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -427,6 +427,9 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" };
memset(tvee, 0, sizeof(*tvee));
+ tvee->tuner_type = TUNER_ABSENT;
+ tvee->tuner2_type = TUNER_ABSENT;
+
done = len = beenhere = 0;
/* Different eeprom start offsets for em28xx, cx2388x and cx23418 */
OpenPOWER on IntegriCloud