Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357518
b: refs/heads/master
c: 8dfef67
h: refs/heads/master
v: v3
  • Loading branch information
Sean Young authored and Mauro Carvalho Chehab committed Feb 8, 2013
1 parent fb97b55 commit cf8b09a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1e801adc7a70c2f67214b2617088a41f4bebe55e
refs/heads/master: 8dfef674e6c954f9b6476c1b252b385c48c9ee26
8 changes: 3 additions & 5 deletions trunk/drivers/media/rc/mceusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,8 @@ static struct usb_device_id mceusb_dev_table[] = {
/* Philips/Spinel plus IR transceiver for ASUS */
{ USB_DEVICE(VENDOR_PHILIPS, 0x2088) },
/* Philips IR transceiver (Dell branded) */
{ USB_DEVICE(VENDOR_PHILIPS, 0x2093) },
{ USB_DEVICE(VENDOR_PHILIPS, 0x2093),
.driver_info = MCE_GEN2_TX_INV },
/* Realtek MCE IR Receiver and card reader */
{ USB_DEVICE(VENDOR_REALTEK, 0x0161),
.driver_info = MULTIFUNCTION },
Expand Down Expand Up @@ -1121,16 +1122,13 @@ static void mceusb_gen1_init(struct mceusb_dev *ir)
mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION));

kfree(data);
};
}

static void mceusb_gen2_init(struct mceusb_dev *ir)
{
/* device resume */
mce_async_out(ir, DEVICE_RESUME, sizeof(DEVICE_RESUME));

/* get hw/sw revision? */
mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION));

/* get wake version (protocol, key, address) */
mce_async_out(ir, GET_WAKEVERSION, sizeof(GET_WAKEVERSION));

Expand Down

0 comments on commit cf8b09a

Please sign in to comment.