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",