---

yaml --- r: 181415 b: refs/heads/master c: eecee32 h: refs/heads/master i: 181413: 0dea8dd 181411: a338c65 181407: d57d8eb v: v3
git-mirror · Feb 26, 2010 · 1ac2e1a · 1ac2e1a
1 parent a960b04
commit 1ac2e1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);