diff options
author | Sean Young <sean@mess.org> | 2013-01-29 06:19:29 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-08 11:15:00 -0500 |
commit | 8dfef674e6c954f9b6476c1b252b385c48c9ee26 (patch) | |
tree | 5963f76a26d0175eda4987f00626b100aea12227 /drivers | |
parent | 1e801adc7a70c2f67214b2617088a41f4bebe55e (diff) |
[media] mceusb: make transmit work on the Philips IR transceiver
The GET_REVISION command puts the device in an unresponsive state,
although it continues to report any IR activity. Note that GET_REVISION
command is not documented, nor is any possible response to it parsed.
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/rc/mceusb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c index 9afb9331217d..14fea35e5d67 100644 --- a/drivers/media/rc/mceusb.c +++ b/drivers/media/rc/mceusb.c | |||
@@ -291,7 +291,8 @@ static struct usb_device_id mceusb_dev_table[] = { | |||
291 | /* Philips/Spinel plus IR transceiver for ASUS */ | 291 | /* Philips/Spinel plus IR transceiver for ASUS */ |
292 | { USB_DEVICE(VENDOR_PHILIPS, 0x2088) }, | 292 | { USB_DEVICE(VENDOR_PHILIPS, 0x2088) }, |
293 | /* Philips IR transceiver (Dell branded) */ | 293 | /* Philips IR transceiver (Dell branded) */ |
294 | { USB_DEVICE(VENDOR_PHILIPS, 0x2093) }, | 294 | { USB_DEVICE(VENDOR_PHILIPS, 0x2093), |
295 | .driver_info = MCE_GEN2_TX_INV }, | ||
295 | /* Realtek MCE IR Receiver and card reader */ | 296 | /* Realtek MCE IR Receiver and card reader */ |
296 | { USB_DEVICE(VENDOR_REALTEK, 0x0161), | 297 | { USB_DEVICE(VENDOR_REALTEK, 0x0161), |
297 | .driver_info = MULTIFUNCTION }, | 298 | .driver_info = MULTIFUNCTION }, |
@@ -1121,16 +1122,13 @@ static void mceusb_gen1_init(struct mceusb_dev *ir) | |||
1121 | mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION)); | 1122 | mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION)); |
1122 | 1123 | ||
1123 | kfree(data); | 1124 | kfree(data); |
1124 | }; | 1125 | } |
1125 | 1126 | ||
1126 | static void mceusb_gen2_init(struct mceusb_dev *ir) | 1127 | static void mceusb_gen2_init(struct mceusb_dev *ir) |
1127 | { | 1128 | { |
1128 | /* device resume */ | 1129 | /* device resume */ |
1129 | mce_async_out(ir, DEVICE_RESUME, sizeof(DEVICE_RESUME)); | 1130 | mce_async_out(ir, DEVICE_RESUME, sizeof(DEVICE_RESUME)); |
1130 | 1131 | ||
1131 | /* get hw/sw revision? */ | ||
1132 | mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION)); | ||
1133 | |||
1134 | /* get wake version (protocol, key, address) */ | 1132 | /* get wake version (protocol, key, address) */ |
1135 | mce_async_out(ir, GET_WAKEVERSION, sizeof(GET_WAKEVERSION)); | 1133 | mce_async_out(ir, GET_WAKEVERSION, sizeof(GET_WAKEVERSION)); |
1136 | 1134 | ||