aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2012-07-01 21:58:52 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 19:36:38 -0300
commit8299d62843d4dcc5d769ce901799b8e7806ec93f (patch)
treed6a7bf17b992840dfe52cb8755b73309bdd50f9e /drivers/media
parent[media] winbond-cir: Fix txandrx module info (diff)
downloadlinux-dev-8299d62843d4dcc5d769ce901799b8e7806ec93f.tar.xz
linux-dev-8299d62843d4dcc5d769ce901799b8e7806ec93f.zip
[media] winbond-cir: Initialise timeout, driver_type and allowed_protos
We need to set a timeout so we can go idle on no activity. Signed-off-by: Anton Blanchard <anton@samba.org> Acked-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/rc/winbond-cir.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index eca17b564cc2..54ee34872d14 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -1032,6 +1032,8 @@ 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->allowed_protos = RC_TYPE_ALL;
if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) {
dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",