From b61f3d3608348c42e94a046ee91943ddf1e0bbc0 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Thu, 16 Dec 2010 12:40:16 -0300
Subject: [PATCH] --- yaml --- r: 223573 b: refs/heads/master c:
 501aaa110a4269c99eff9736a81b5f93bb8b59be h: refs/heads/master i:   223571:
 af0516a9a9d94f968424039c16e6164f629f1caf v: v3

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

diff --git a/[refs] b/[refs]
index 8b568ea16916..4162a3ddd066 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8cc7fd7e6371026c15254a35e618d2e5c5bf562
+refs/heads/master: 501aaa110a4269c99eff9736a81b5f93bb8b59be
diff --git a/trunk/drivers/media/IR/mceusb.c b/trunk/drivers/media/IR/mceusb.c
index 3a968f082e65..392ca24132da 100644
--- a/trunk/drivers/media/IR/mceusb.c
+++ b/trunk/drivers/media/IR/mceusb.c
@@ -1073,6 +1073,7 @@ static struct input_dev *mceusb_init_input_dev(struct mceusb_dev *ir)
 	props->priv = ir;
 	props->driver_type = RC_DRIVER_IR_RAW;
 	props->allowed_protos = IR_TYPE_ALL;
+	props->timeout = MS_TO_NS(1000);
 	if (!ir->flags.no_tx) {
 		props->s_tx_mask = mceusb_set_tx_mask;
 		props->s_tx_carrier = mceusb_set_tx_carrier;