From 4ada8487ad26fb1dcae867b2656ad904ddf2cb54 Mon Sep 17 00:00:00 2001
From: Rafi Rubin <rafi@seas.upenn.edu>
Date: Sun, 3 Jul 2011 17:13:53 -0300
Subject: [PATCH] --- yaml --- r: 254955 b: refs/heads/master c:
 9824ae4aff2793947ea78c4c8147bb6c59efdcba h: refs/heads/master i:   254953:
 36873a2c7823dedf9aae3430197d2bd39b683b7d   254951:
 2ab395cbc4e85e008b14f3d21d36f1f64e6ab723 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/media/rc/mceusb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cc7eb91cc081..4e9eef58fdd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3e456cb899304bed183247ed3228f7ff855eebd
+refs/heads/master: 9824ae4aff2793947ea78c4c8147bb6c59efdcba
diff --git a/trunk/drivers/media/rc/mceusb.c b/trunk/drivers/media/rc/mceusb.c
index b928a61736d7..ec972dc25790 100644
--- a/trunk/drivers/media/rc/mceusb.c
+++ b/trunk/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;