From e6f0fbaa36f33fb3943acc515235237b0672c28a Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:52 +0200
Subject: [PATCH] --- yaml --- r: 100386 b: refs/heads/master c:
 f138e4814a9c28bc44d967a8effdd977ac00fc6e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1a98af324737..b14235030b86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25368ca579905efe7f7dda43c252eb7b371de98c
+refs/heads/master: f138e4814a9c28bc44d967a8effdd977ac00fc6e
diff --git a/trunk/drivers/sbus/char/uctrl.c b/trunk/drivers/sbus/char/uctrl.c
index 383f32c1d347..513ba61ae966 100644
--- a/trunk/drivers/sbus/char/uctrl.c
+++ b/trunk/drivers/sbus/char/uctrl.c
@@ -9,6 +9,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
@@ -211,8 +212,10 @@ uctrl_ioctl(struct inode *inode, struct file *file,
 static int
 uctrl_open(struct inode *inode, struct file *file)
 {
+	lock_kernel();
 	uctrl_get_event_status();
 	uctrl_get_external_status();
+	unlock_kernel();
 	return 0;
 }