diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2012-01-03 04:27:06 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-06 10:07:42 -0500 |
commit | 245900c4a7a7d23c2e5b2b64b70770debcac5814 (patch) | |
tree | ea1c119e7df3e8ef6ee28945ae591ca6ae323d9a | |
parent | 74e07f3e309599864656fb4560c498478d22d43c (diff) |
[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>
-rw-r--r-- | drivers/media/dvb/dvb-usb/it913x.c | 5 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/it913x-fe.h | 2 |
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 21b7478ca7dc..eb6a1bb6bffc 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, | |||
397 | else if (le16_to_cpu(udev->descriptor.idProduct) == | 397 | else if (le16_to_cpu(udev->descriptor.idProduct) == |
398 | USB_PID_ITETECH_IT9135_9006) { | 398 | USB_PID_ITETECH_IT9135_9006) { |
399 | sw = IT9135_V2_FW; | 399 | sw = IT9135_V2_FW; |
400 | it913x_config.tuner_id_0 = 0x60; | 400 | if (it913x_config.tuner_id_0 == 0) |
401 | it913x_config.tuner_id_0 = IT9135_60; | ||
401 | } else | 402 | } else |
402 | sw = IT9137_FW; | 403 | sw = IT9137_FW; |
403 | 404 | ||
@@ -836,5 +837,5 @@ module_exit(it913x_module_exit); | |||
836 | 837 | ||
837 | MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>"); | 838 | MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>"); |
838 | MODULE_DESCRIPTION("it913x USB 2 Driver"); | 839 | MODULE_DESCRIPTION("it913x USB 2 Driver"); |
839 | MODULE_VERSION("1.21"); | 840 | MODULE_VERSION("1.22"); |
840 | MODULE_LICENSE("GPL"); | 841 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/media/dvb/frontends/it913x-fe.h b/drivers/media/dvb/frontends/it913x-fe.h index 4143ef9c4fab..5ee3e2f14165 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( | |||
161 | /* Build in tuner types */ | 161 | /* Build in tuner types */ |
162 | #define IT9137 0x38 | 162 | #define IT9137 0x38 |
163 | #define IT9135_38 0x38 | 163 | #define IT9135_38 0x38 |
164 | #define IT9135_51 0x50 | 164 | #define IT9135_51 0x51 |
165 | #define IT9135_52 0x52 | 165 | #define IT9135_52 0x52 |
166 | #define IT9135_60 0x60 | 166 | #define IT9135_60 0x60 |
167 | #define IT9135_61 0x61 | 167 | #define IT9135_61 0x61 |