summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2010-12-16 12:40:16 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-20 14:11:18 -0200
commit501aaa110a4269c99eff9736a81b5f93bb8b59be (patch)
tree3c95c0a89e6a7b7d7e2449ea0ece469105d3e4cb /drivers
parentd8cc7fd7e6371026c15254a35e618d2e5c5bf562 (diff)
downloadlinux-501aaa110a4269c99eff9736a81b5f93bb8b59be.tar.gz
linux-501aaa110a4269c99eff9736a81b5f93bb8b59be.tar.bz2
linux-501aaa110a4269c99eff9736a81b5f93bb8b59be.zip
[media] mceusb: set a default rx timeout
Its possible for the call to read rx timeout from the hardware to fail, in which case we end up with a bogus rx timeout value. Set a default one when filling in the rc struct, and we'll just overwrite it later w/the value from hardware, but if that read fails, we've at least got a sane rx timeout value to work with (1000ms is the default value I've seen returned on most if not all mceusb hardware). Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/IR/mceusb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/IR/mceusb.c b/drivers/media/IR/mceusb.c
index 3a968f082e65..392ca24132da 100644
--- a/drivers/media/IR/mceusb.c
+++ b/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;