summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/winbond-cir.c
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2017-01-26 14:35:31 -0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-03-24 08:21:17 -0300
commitea80fb6d08a0015badc9a8b8ab7e95eeeaa578b1 (patch)
tree5159d7df0b899d7d8a98ee06c83b21cfa98645f4 /drivers/media/rc/winbond-cir.c
parentbc989391ab08ef75602a82cacf4fabc9f12095e5 (diff)
downloadtalos-obmc-linux-ea80fb6d08a0015badc9a8b8ab7e95eeeaa578b1.tar.gz
talos-obmc-linux-ea80fb6d08a0015badc9a8b8ab7e95eeeaa578b1.zip
[media] winbond: allow timeout to be set
The drivers sets the hardware to idle when a timeout occurs. This can be any reasonable value. Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/rc/winbond-cir.c')
-rw-r--r--drivers/media/rc/winbond-cir.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index dc1c8305ad23..5a4d4a611197 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -1082,7 +1082,9 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
data->dev->tx_ir = wbcir_tx;
data->dev->priv = data;
data->dev->dev.parent = &device->dev;
- data->dev->timeout = MS_TO_NS(100);
+ data->dev->min_timeout = 1;
+ data->dev->timeout = IR_DEFAULT_TIMEOUT;
+ data->dev->max_timeout = 10 * IR_DEFAULT_TIMEOUT;
data->dev->rx_resolution = US_TO_NS(2);
data->dev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
data->dev->allowed_wakeup_protocols = RC_BIT_NEC | RC_BIT_NECX |
OpenPOWER on IntegriCloud