git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
media: rc: harmonize infrared durations to microseconds
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
pci
/
cx23885
/
cx23888-ir.c
diff --git
a/drivers/media/pci/cx23885/cx23888-ir.c
b/drivers/media/pci/cx23885/cx23888-ir.c
index ad7f8ccad526c2aba6efd7d4ff8d8cf6ed99a1b8..ddfd2eb37484d624924f94e7ab6a325373844bd1 100644
(file)
--- a/
drivers/media/pci/cx23885/cx23888-ir.c
+++ b/
drivers/media/pci/cx23885/cx23888-ir.c
@@
-663,7
+663,7
@@
static int cx23888_ir_rx_read(struct v4l2_subdev *sd, u8 *buf, size_t count,
}
v = (unsigned) pulse_width_count_to_ns(
- (u16)
(p->hw_fifo_data & FIFO_RXTX), divider)
;
+ (u16)
(p->hw_fifo_data & FIFO_RXTX), divider) / 1000
;
if (v > IR_MAX_DURATION)
v = IR_MAX_DURATION;