From cc88824c688e5ff092f40fc2c25624ef0b951932 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Sun, 1 Jul 2012 21:58:52 -0300 Subject: [PATCH] --- yaml --- r: 311899 b: refs/heads/master c: 8299d62843d4dcc5d769ce901799b8e7806ec93f h: refs/heads/master i: 311897: cfe1cbd72c0886322c08ac69af8ef6797652667d 311895: d4623d8e1be741e61ce75e013e0a75027dfaf6c4 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/winbond-cir.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 69cce2e4bfe6..b7b79e6409fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57f4422f7bd83bb0a092e3f9aea0d9c8ac59045e +refs/heads/master: 8299d62843d4dcc5d769ce901799b8e7806ec93f diff --git a/trunk/drivers/media/rc/winbond-cir.c b/trunk/drivers/media/rc/winbond-cir.c index eca17b564cc2..54ee34872d14 100644 --- a/trunk/drivers/media/rc/winbond-cir.c +++ b/trunk/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",