---

yaml --- r: 100287 b: refs/heads/master c: 16750c2 h: refs/heads/master i: 100285: 14c0f8e 100283: f13577f 100279: 6f12125 100271: 42ae260 100255: a70c45d 100223: 9482a58 v: v3
git-mirror · Jun 20, 2008 · 4c3e5c4 · 4c3e5c4
1 parent 20d0c4c
commit 4c3e5c4
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: 70ffa16e604bab22b12bf72cb7796f1dd01ec335
+refs/heads/master: 16750c2f32e3fd879fce787a13900f11633ef9af
diff --git a/trunk/drivers/telephony/phonedev.c b/trunk/drivers/telephony/phonedev.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/phonedev.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
@@ -53,6 +54,7 @@ static int phone_open(struct inode *inode, struct file *file)
 	if (minor >= PHONE_NUM_DEVICES)
 		return -ENODEV;
 
+	lock_kernel();
 	mutex_lock(&phone_lock);
 	p = phone_device[minor];
 	if (p)
@@ -79,6 +81,7 @@ static int phone_open(struct inode *inode, struct file *file)
 	fops_put(old_fops);
 end:
 	mutex_unlock(&phone_lock);
+	unlock_kernel();
 	return err;
 }