diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 12:23:27 +0300 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 12:23:27 +0300 |
commit | 6b620478e58677bb3f4ec884abb29ef9d68c7821 (patch) | |
tree | 7a438fc5412587f9bd9b907d4d423ea52a498006 /drivers/media/rc/mceusb.c | |
parent | 906b17dc089f7fa87e37a9cfe6ee185efc90e0da (diff) | |
parent | 6fb1b304255efc5c4c93874ac8c066272e257e28 (diff) | |
download | linux-6b620478e58677bb3f4ec884abb29ef9d68c7821.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Diffstat (limited to 'drivers/media/rc/mceusb.c')
-rw-r--r-- | drivers/media/rc/mceusb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c index 0fef6efad537..079353e5d558 100644 --- a/drivers/media/rc/mceusb.c +++ b/drivers/media/rc/mceusb.c @@ -48,7 +48,6 @@ #define USB_BUFLEN 32 /* USB reception buffer length */ #define USB_CTRL_MSG_SZ 2 /* Size of usb ctrl msg on gen1 hw */ #define MCE_G1_INIT_MSGS 40 /* Init messages on gen1 hw to throw out */ -#define MS_TO_NS(msec) ((msec) * 1000) /* MCE constants */ #define MCE_CMDBUF_SIZE 384 /* MCE Command buffer length */ @@ -858,7 +857,7 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len) ir->rem--; rawir.pulse = ((ir->buf_in[i] & MCE_PULSE_BIT) != 0); rawir.duration = (ir->buf_in[i] & MCE_PULSE_MASK) - * MS_TO_NS(MCE_TIME_UNIT); + * MS_TO_US(MCE_TIME_UNIT); dev_dbg(ir->dev, "Storing %s with duration %d\n", rawir.pulse ? "pulse" : "space", |