diff options
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 @@ | |||
| 48 | #define USB_BUFLEN 32 /* USB reception buffer length */ | 48 | #define USB_BUFLEN 32 /* USB reception buffer length */ |
| 49 | #define USB_CTRL_MSG_SZ 2 /* Size of usb ctrl msg on gen1 hw */ | 49 | #define USB_CTRL_MSG_SZ 2 /* Size of usb ctrl msg on gen1 hw */ |
| 50 | #define MCE_G1_INIT_MSGS 40 /* Init messages on gen1 hw to throw out */ | 50 | #define MCE_G1_INIT_MSGS 40 /* Init messages on gen1 hw to throw out */ |
| 51 | #define MS_TO_NS(msec) ((msec) * 1000) | ||
| 52 | 51 | ||
| 53 | /* MCE constants */ | 52 | /* MCE constants */ |
| 54 | #define MCE_CMDBUF_SIZE 384 /* MCE Command buffer length */ | 53 | #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) | |||
| 858 | ir->rem--; | 857 | ir->rem--; |
| 859 | rawir.pulse = ((ir->buf_in[i] & MCE_PULSE_BIT) != 0); | 858 | rawir.pulse = ((ir->buf_in[i] & MCE_PULSE_BIT) != 0); |
| 860 | rawir.duration = (ir->buf_in[i] & MCE_PULSE_MASK) | 859 | rawir.duration = (ir->buf_in[i] & MCE_PULSE_MASK) |
| 861 | * MS_TO_NS(MCE_TIME_UNIT); | 860 | * MS_TO_US(MCE_TIME_UNIT); |
| 862 | 861 | ||
| 863 | dev_dbg(ir->dev, "Storing %s with duration %d\n", | 862 | dev_dbg(ir->dev, "Storing %s with duration %d\n", |
| 864 | rawir.pulse ? "pulse" : "space", | 863 | rawir.pulse ? "pulse" : "space", |