---

yaml --- r: 100346 b: refs/heads/master c: 78abb6a h: refs/heads/master v: v3
git-mirror · Jun 20, 2008 · 2b2f556 · 2b2f556
1 parent 04a92b9
commit 2b2f556
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d17bf0c08569e7aefd27df0179065fb955588c4
+refs/heads/master: 78abb6ac919cee123e632d833a42d0312ccb2b0d
diff --git a/trunk/drivers/sbus/char/flash.c b/trunk/drivers/sbus/char/flash.c
@@ -127,9 +127,13 @@ flash_read(struct file * file, char __user * buf,
 static int
 flash_open(struct inode *inode, struct file *file)
 {
-	if (test_and_set_bit(0, (void *)&flash.busy) != 0)
+	lock_kernel();
+	if (test_and_set_bit(0, (void *)&flash.busy) != 0) {
+		unlock_kernel();
 		return -EBUSY;
+	}
 
+	unlock_kernel();
 	return 0;
 }