diff options
| author | Antti Palosaari <crope@iki.fi> | 2010-02-10 20:44:12 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 15:10:58 -0300 |
| commit | 58c811df63a7c494639b4fe49d7af8fd0b32019b (patch) | |
| tree | 985cf4bd2bb1266fc5e234b42a57f18c4b60bc1e /drivers/media/dvb | |
| 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')
| -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 b926473363e..00b8e2a8228 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[] = { { 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( |