diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 11:00:09 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 11:00:09 -0200 |
| commit | 431fbfba72c77eb4dd9a529b492410b7161cafe4 (patch) | |
| tree | c383afe70a28220f78912bc63502ffc9bc05b3a5 /linux/drivers/media/dvb/dvb-usb/af9015.c | |
| parent | 4bed69bfcb36161bcd89a7a61b6a912c32fea813 (diff) | |
| parent | e673ee96f4708b75bd25a9d4995dcf49667e239f (diff) | |
| download | mediapointer-dvb-s2-431fbfba72c77eb4dd9a529b492410b7161cafe4.tar.gz mediapointer-dvb-s2-431fbfba72c77eb4dd9a529b492410b7161cafe4.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/af9015.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/af9015.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/af9015.c b/linux/drivers/media/dvb/dvb-usb/af9015.c index 21e10fa23..b2f724fb5 100644 --- a/linux/drivers/media/dvb/dvb-usb/af9015.c +++ b/linux/drivers/media/dvb/dvb-usb/af9015.c @@ -681,12 +681,6 @@ static int af9015_download_firmware(struct usb_device *udev, goto error; } - /* firmware is running, reconnect device in the usb bus */ - req.cmd = RECONNECT_USB; - ret = af9015_rw_udev(udev, &req); - if (ret) - err("reconnect failed: %d", ret); - error: return ret; } @@ -739,6 +733,16 @@ static int af9015_read_config(struct usb_device *udev) af9015_config.ir_table_size = ARRAY_SIZE(af9015_ir_table_mygictv); break; + case AF9015_REMOTE_DIGITTRADE_DVB_T: + af9015_properties[i].rc_key_map = + af9015_rc_keys_digittrade; + af9015_properties[i].rc_key_map_size = + ARRAY_SIZE(af9015_rc_keys_digittrade); + af9015_config.ir_table = + af9015_ir_table_digittrade; + af9015_config.ir_table_size = + ARRAY_SIZE(af9015_ir_table_digittrade); + break; } } else { switch (udev->descriptor.idVendor) { @@ -1219,6 +1223,7 @@ static struct dvb_usb_device_properties af9015_properties[] = { .usb_ctrl = DEVICE_SPECIFIC, .download_firmware = af9015_download_firmware, .firmware = "dvb-usb-af9015.fw", + .no_reconnect = 1, .size_of_priv = sizeof(struct af9015_state), \ @@ -1317,6 +1322,7 @@ static struct dvb_usb_device_properties af9015_properties[] = { .usb_ctrl = DEVICE_SPECIFIC, .download_firmware = af9015_download_firmware, .firmware = "dvb-usb-af9015.fw", + .no_reconnect = 1, .size_of_priv = sizeof(struct af9015_state), \ |