From 8d7de65c4c16787ddfd5186caecd669c44a834de Mon Sep 17 00:00:00 2001
From: Richard Holden <aciddeath@gmail.com>
Date: Sat, 18 Oct 2008 20:27:53 -0700
Subject: [PATCH] --- yaml --- r: 115916 b: refs/heads/master c:
 60c11d2abf4ef811d0ce3ea34279746729c4c6fc h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1b3cec75c6e0..f654ae9aeb54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e680aae4e53ab54cdbb0c29257dae0cbb158e1c
+refs/heads/master: 60c11d2abf4ef811d0ce3ea34279746729c4c6fc
diff --git a/trunk/drivers/telephony/phonedev.c b/trunk/drivers/telephony/phonedev.c
index 4d74ba36c3a1..37caf4d69037 100644
--- a/trunk/drivers/telephony/phonedev.c
+++ b/trunk/drivers/telephony/phonedev.c
@@ -54,7 +54,6 @@ 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)
@@ -81,7 +80,6 @@ static int phone_open(struct inode *inode, struct file *file)
 	fops_put(old_fops);
 end:
 	mutex_unlock(&phone_lock);
-	unlock_kernel();
 	return err;
 }