diff options
| author | Anton Blanchard <anton@samba.org> | 2012-07-01 20:58:52 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-06 18:36:38 -0400 |
| commit | 8299d62843d4dcc5d769ce901799b8e7806ec93f (patch) | |
| tree | d6a7bf17b992840dfe52cb8755b73309bdd50f9e | |
| parent | 57f4422f7bd83bb0a092e3f9aea0d9c8ac59045e (diff) | |
[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>
| -rw-r--r-- | drivers/media/rc/winbond-cir.c | 2 |
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) | |||
| 1032 | data->dev->tx_ir = wbcir_tx; | 1032 | data->dev->tx_ir = wbcir_tx; |
| 1033 | data->dev->priv = data; | 1033 | data->dev->priv = data; |
| 1034 | data->dev->dev.parent = &device->dev; | 1034 | data->dev->dev.parent = &device->dev; |
| 1035 | data->dev->timeout = MS_TO_NS(100); | ||
| 1036 | data->dev->allowed_protos = RC_TYPE_ALL; | ||
| 1035 | 1037 | ||
| 1036 | if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) { | 1038 | if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) { |
| 1037 | dev_err(dev, "Region 0x%lx-0x%lx already in use!\n", | 1039 | dev_err(dev, "Region 0x%lx-0x%lx already in use!\n", |
