From 501aaa110a4269c99eff9736a81b5f93bb8b59be Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Thu, 16 Dec 2010 12:40:16 -0300 Subject: [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 Signed-off-by: Mauro Carvalho Chehab --- drivers/media/IR/mceusb.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers') diff --git a/drivers/media/IR/mceusb.c b/drivers/media/IR/mceusb.c index 3a968f082e6..392ca24132d 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; -- cgit v1.2.3