summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafi Rubin <rafi@seas.upenn.edu>2011-07-03 17:13:53 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-11 20:52:27 -0300
commit9824ae4aff2793947ea78c4c8147bb6c59efdcba (patch)
tree4d07fbcf0a14dde313f99e808c5d9b551ff79096
parentf3e456cb899304bed183247ed3228f7ff855eebd (diff)
downloadop-kernel-dev-9824ae4aff2793947ea78c4c8147bb6c59efdcba.zip
op-kernel-dev-9824ae4aff2793947ea78c4c8147bb6c59efdcba.tar.gz
[media] mceusb: increase default timeout to 100ms
This matches the typical timeout advertised by hardware, once we're actually interpreting it correctly. Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu> Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/rc/mceusb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index b928a61..ec972dc 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -1079,7 +1079,7 @@ static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir)
rc->priv = ir;
rc->driver_type = RC_DRIVER_IR_RAW;
rc->allowed_protos = RC_TYPE_ALL;
- rc->timeout = US_TO_NS(1000);
+ rc->timeout = MS_TO_NS(100);
if (!ir->flags.no_tx) {
rc->s_tx_mask = mceusb_set_tx_mask;
rc->s_tx_carrier = mceusb_set_tx_carrier;
OpenPOWER on IntegriCloud