diff --git a/[refs] b/[refs]
index ab6508696182..695fa095ba60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4b778d36889b4d51d79a99f8a96e110def8541c
+refs/heads/master: eecee32ac2c4b00b76cc8d99fd8d2b9fd54a283d
diff --git a/trunk/drivers/media/IR/ir-sysfs.c b/trunk/drivers/media/IR/ir-sysfs.c
index a96738135bb0..d73589ad55e6 100644
--- a/trunk/drivers/media/IR/ir-sysfs.c
+++ b/trunk/drivers/media/IR/ir-sysfs.c
@@ -79,6 +79,7 @@ static ssize_t store_protocol(struct device *d,
 	struct ir_input_dev *ir_dev = dev_get_drvdata(d);
 	enum ir_type ir_type = IR_TYPE_UNKNOWN;
 	int rc = -EINVAL;
+	unsigned long flags;
 	char *buf;
 
 	buf = strsep((char **) &data, "\n");
@@ -104,7 +105,9 @@ static ssize_t store_protocol(struct device *d,
 		return -EINVAL;
 	}
 
+	spin_lock_irqsave(&ir_dev->rc_tab.lock, flags);
 	ir_dev->rc_tab.ir_type = ir_type;
+	spin_unlock_irqrestore(&ir_dev->rc_tab.lock, flags);
 
 	IR_dprintk(1, "Current protocol is %ld\n", ir_type);