---

yaml --- r: 285742 b: refs/heads/master c: 245900c h: refs/heads/master v: v3
git-mirror · Jan 6, 2012 · 882c67c · 882c67c
1 parent 8acd8d0
commit 882c67c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74e07f3e309599864656fb4560c498478d22d43c
+refs/heads/master: 245900c4a7a7d23c2e5b2b64b70770debcac5814
diff --git a/trunk/drivers/media/dvb/dvb-usb/it913x.c b/trunk/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/trunk/drivers/media/dvb/frontends/it913x-fe.h b/trunk/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