From 50cac07354f29fdd9ae42b9d0c66fedb2e66a8aa Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 16 May 2008 14:08:58 -0600
Subject: [PATCH] --- yaml --- r: 100311 b: refs/heads/master c:
 9aaf20cbf5b7cccd45495326cba0b35b2884e6b3 h: refs/heads/master i:   100309:
 7495f693770cde0618962ea2e5d85e8db3d2282f   100307:
 c815a4aa30d215e86a0bc13ecc78f4f9612d4dc2   100303:
 86a848d50f2528da86a821672f027e7390e61ca5 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/sbus/char/vfc_dev.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ece59bb99eef..ddd732a2b4f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e9829ad38c24aa71252e643836e7cedcb1c83d7
+refs/heads/master: 9aaf20cbf5b7cccd45495326cba0b35b2884e6b3
diff --git a/trunk/drivers/sbus/char/vfc_dev.c b/trunk/drivers/sbus/char/vfc_dev.c
index d4f8fcded51d..1f6cb8ae2784 100644
--- a/trunk/drivers/sbus/char/vfc_dev.c
+++ b/trunk/drivers/sbus/char/vfc_dev.c
@@ -24,6 +24,7 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/mm.h>
+#include <linux/smp_lock.h>
 
 #include <asm/openprom.h>
 #include <asm/oplib.h>
@@ -178,14 +179,17 @@ static int vfc_open(struct inode *inode, struct file *file)
 {
 	struct vfc_dev *dev;
 
+	lock_kernel();
 	spin_lock(&vfc_dev_lock);
 	dev = vfc_get_dev_ptr(iminor(inode));
 	if (dev == NULL) {
 		spin_unlock(&vfc_dev_lock);
+		unlock_kernel();
 		return -ENODEV;
 	}
 	if (dev->busy) {
 		spin_unlock(&vfc_dev_lock);
+		unlock_kernel();
 		return -EBUSY;
 	}
 
@@ -202,6 +206,7 @@ static int vfc_open(struct inode *inode, struct file *file)
 	vfc_captstat_reset(dev);
 	
 	vfc_unlock_device(dev);
+	unlock_kernel();
 	return 0;
 }