From 4c3e5c4ea9938fde7eb120ee67b454e1c0cb0b3a Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Thu, 15 May 2008 11:58:31 -0600
Subject: [PATCH] --- yaml --- r: 100287 b: refs/heads/master c:
 16750c2f32e3fd879fce787a13900f11633ef9af h: refs/heads/master i:   100285:
 14c0f8e8d71e73d5ecc1b2cf16c9897ec04c5a97   100283:
 f13577f8f999ee5598b480369204b5200afb4f68   100279:
 6f12125be16d4f4f9a3f1969d4a30c8a0fb95aef   100271:
 42ae260b14a59bb5d26dc303c6ef96dfcbfd487f   100255:
 a70c45d3c9336532e324d8a619f6b66bfa06cdd0   100223:
 9482a587ecb401a48d417fa3591505b2e12ffe7d v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/telephony/phonedev.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7ca2c43f094f..4862a143b7ac 100644
--- 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
index bcea8d9b718c..4d74ba36c3a1 100644
--- 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;
 }