---

yaml --- r: 311899 b: refs/heads/master c: 8299d62 h: refs/heads/master i: 311897: cfe1cbd 311895: d4623d8 v: v3
git-mirror · Jul 6, 2012 · cc88824 · cc88824
1 parent c3ebe0f
commit cc88824
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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",