diff --git a/[refs] b/[refs]
index 8f2c0aee1f63..9505c436b893 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8afc539c4a3df5da4e90c36cf21e2bc7a2572149
+refs/heads/master: 9f711a80c5d0048e85c129f23281d9c0634e7010
diff --git a/trunk/drivers/media/video/tm6000/tm6000-input.c b/trunk/drivers/media/video/tm6000/tm6000-input.c
index 6eaf7705e73a..e3467d4245cb 100644
--- a/trunk/drivers/media/video/tm6000/tm6000-input.c
+++ b/trunk/drivers/media/video/tm6000/tm6000-input.c
@@ -416,6 +416,8 @@ int tm6000_ir_init(struct tm6000_core *dev)
 
 	/* input setup */
 	rc->allowed_protos = RC_TYPE_RC5 | RC_TYPE_NEC;
+	/* Neded, in order to support NEC remotes with 24 or 32 bits */
+	rc->scanmask = 0xffff;
 	rc->priv = ir;
 	rc->change_protocol = tm6000_ir_change_protocol;
 	if (&dev->int_in) {