---

yaml --- r: 181671 b: refs/heads/master c: 58c811d h: refs/heads/master i: 181669: c48730e 181667: 21e1417 181663: ef25ecb v: v3
git-mirror · Feb 26, 2010 · be648a6 · be648a6
1 parent 617e9ed
commit be648a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db02d9dc544be25330fe491eddd2766d1fb7e325
+refs/heads/master: 58c811df63a7c494639b4fe49d7af8fd0b32019b
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9015.c b/trunk/drivers/media/dvb/dvb-usb/af9015.c
@@ -795,6 +795,9 @@ static const struct af9015_setup af9015_setup_hashes[] = {
 	{ 0xa3703d00,
 		af9015_rc_keys_a_link, ARRAY_SIZE(af9015_rc_keys_a_link),
 		af9015_ir_table_a_link, ARRAY_SIZE(af9015_ir_table_a_link) },
+	{ 0x9b7dc64e,
+		af9015_rc_keys_mygictv, ARRAY_SIZE(af9015_rc_keys_mygictv),
+		af9015_ir_table_mygictv, ARRAY_SIZE(af9015_ir_table_mygictv) },
 	{ }
 };
 
@@ -823,13 +826,7 @@ static void af9015_set_remote_config(struct usb_device *udev,
 			memset(manufacturer, 0, sizeof(manufacturer));
 			usb_string(udev, udev->descriptor.iManufacturer,
 				manufacturer, sizeof(manufacturer));
-			if (!strcmp("Geniatech", manufacturer)) {
-				/* iManufacturer 1 Geniatech
-				   iProduct      2 AF9015 */
-				table = af9015_setup_match(
-					AF9015_REMOTE_MYGICTV_U718,
-					af9015_setup_modparam);
-			} else if (!strcmp("MSI", manufacturer)) {
+			if (!strcmp("MSI", manufacturer)) {
 				/* iManufacturer 1 MSI
 				   iProduct      2 MSI K-VOX */
 				table = af9015_setup_match(