diff options
author | Antti Palosaari <crope@iki.fi> | 2010-02-10 18:44:12 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:10:58 -0500 |
commit | 58c811df63a7c494639b4fe49d7af8fd0b32019b (patch) | |
tree | 985cf4bd2bb1266fc5e234b42a57f18c4b60bc1e /drivers/media/dvb/dvb-usb/af9015.c | |
parent | db02d9dc544be25330fe491eddd2766d1fb7e325 (diff) |
V4L/DVB: af9015: MYGICTV U718 remote autodetection
Autodetect MYGICTV U718 from eeprom hash and select remote automatically.
Remove old iManufacturer string compare based remote selection logic.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/af9015.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/af9015.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index b926473363e4..00b8e2a82286 100644 --- a/drivers/media/dvb/dvb-usb/af9015.c +++ b/drivers/media/dvb/dvb-usb/af9015.c | |||
@@ -795,6 +795,9 @@ static const struct af9015_setup af9015_setup_hashes[] = { | |||
795 | { 0xa3703d00, | 795 | { 0xa3703d00, |
796 | af9015_rc_keys_a_link, ARRAY_SIZE(af9015_rc_keys_a_link), | 796 | af9015_rc_keys_a_link, ARRAY_SIZE(af9015_rc_keys_a_link), |
797 | af9015_ir_table_a_link, ARRAY_SIZE(af9015_ir_table_a_link) }, | 797 | af9015_ir_table_a_link, ARRAY_SIZE(af9015_ir_table_a_link) }, |
798 | { 0x9b7dc64e, | ||
799 | af9015_rc_keys_mygictv, ARRAY_SIZE(af9015_rc_keys_mygictv), | ||
800 | af9015_ir_table_mygictv, ARRAY_SIZE(af9015_ir_table_mygictv) }, | ||
798 | { } | 801 | { } |
799 | }; | 802 | }; |
800 | 803 | ||
@@ -823,13 +826,7 @@ static void af9015_set_remote_config(struct usb_device *udev, | |||
823 | memset(manufacturer, 0, sizeof(manufacturer)); | 826 | memset(manufacturer, 0, sizeof(manufacturer)); |
824 | usb_string(udev, udev->descriptor.iManufacturer, | 827 | usb_string(udev, udev->descriptor.iManufacturer, |
825 | manufacturer, sizeof(manufacturer)); | 828 | manufacturer, sizeof(manufacturer)); |
826 | if (!strcmp("Geniatech", manufacturer)) { | 829 | if (!strcmp("MSI", manufacturer)) { |
827 | /* iManufacturer 1 Geniatech | ||
828 | iProduct 2 AF9015 */ | ||
829 | table = af9015_setup_match( | ||
830 | AF9015_REMOTE_MYGICTV_U718, | ||
831 | af9015_setup_modparam); | ||
832 | } else if (!strcmp("MSI", manufacturer)) { | ||
833 | /* iManufacturer 1 MSI | 830 | /* iManufacturer 1 MSI |
834 | iProduct 2 MSI K-VOX */ | 831 | iProduct 2 MSI K-VOX */ |
835 | table = af9015_setup_match( | 832 | table = af9015_setup_match( |