summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2012-01-03 09:27:06 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-06 15:07:42 (GMT)
commit245900c4a7a7d23c2e5b2b64b70770debcac5814 (patch)
treeea1c119e7df3e8ef6ee28945ae591ca6ae323d9a /drivers/media
parent74e07f3e309599864656fb4560c498478d22d43c (diff)
downloadlinux-245900c4a7a7d23c2e5b2b64b70770debcac5814.tar.xz
[media] it913x ver 1.22 corrections to Tuner IDs
Correction to tuner ID 0x51. Don't force tuner ID 0x60 unless eprom data zero. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/it913x.c5
-rw-r--r--drivers/media/dvb/frontends/it913x-fe.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/it913x.c b/drivers/media/dvb/dvb-usb/it913x.c
index 21b7478..eb6a1bb 100644
--- a/drivers/media/dvb/dvb-usb/it913x.c
+++ b/drivers/media/dvb/dvb-usb/it913x.c
@@ -397,7 +397,8 @@ static int ite_firmware_select(struct usb_device *udev,
else if (le16_to_cpu(udev->descriptor.idProduct) ==
USB_PID_ITETECH_IT9135_9006) {
sw = IT9135_V2_FW;
- it913x_config.tuner_id_0 = 0x60;
+ if (it913x_config.tuner_id_0 == 0)
+ it913x_config.tuner_id_0 = IT9135_60;
} else
sw = IT9137_FW;
@@ -836,5 +837,5 @@ module_exit(it913x_module_exit);
MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
MODULE_DESCRIPTION("it913x USB 2 Driver");
-MODULE_VERSION("1.21");
+MODULE_VERSION("1.22");
MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/it913x-fe.h b/drivers/media/dvb/frontends/it913x-fe.h
index 4143ef9..5ee3e2f 100644
--- a/drivers/media/dvb/frontends/it913x-fe.h
+++ b/drivers/media/dvb/frontends/it913x-fe.h
@@ -161,7 +161,7 @@ static inline struct dvb_frontend *it913x_fe_attach(
/* Build in tuner types */
#define IT9137 0x38
#define IT9135_38 0x38
-#define IT9135_51 0x50
+#define IT9135_51 0x51
#define IT9135_52 0x52
#define IT9135_60 0x60
#define IT9135_61 0x61