summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2011-07-11 12:09:00 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-11 20:52:37 -0300
commitd7b290a1056c5564eec8a1b169c6e84ff3f54c13 (patch)
tree15a616e0324439905619f1ace3ec3b3820ad7780 /drivers
parent9824ae4aff2793947ea78c4c8147bb6c59efdcba (diff)
downloadlinux-d7b290a1056c5564eec8a1b169c6e84ff3f54c13.tar.gz
linux-d7b290a1056c5564eec8a1b169c6e84ff3f54c13.tar.bz2
linux-d7b290a1056c5564eec8a1b169c6e84ff3f54c13.zip
[media] nuvoton-cir: make idle timeout more sane
The nuvoton-cir inherited an insanely low idle timeout value from the mceusb driver. We're fixing mceusb, should fix this driver too. 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/rc/nuvoton-cir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 565f24c20d77..ce595f9ab4c7 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -1110,7 +1110,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
rdev->dev.parent = &pdev->dev;
rdev->driver_name = NVT_DRIVER_NAME;
rdev->map_name = RC_MAP_RC6_MCE;
- rdev->timeout = US_TO_NS(1000);
+ rdev->timeout = MS_TO_NS(100);
/* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */
rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD);
#if 0