aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2008-05-20 19:15:36 +0200
committerJonathan Corbet <corbet@lwn.net>2008-06-20 14:05:54 -0600
commit52e7c5e08201e20ddbe93cb1977869c38072bc2f (patch)
tree21947b58d4c822f94b56dad8f70fc5a5e0329d75
parentapm_32: BKL pushdown (diff)
downloadlinux-dev-52e7c5e08201e20ddbe93cb1977869c38072bc2f.tar.xz
linux-dev-52e7c5e08201e20ddbe93cb1977869c38072bc2f.zip
basler-excite: BKL pushdown
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/mips/basler/excite/excite_iodev.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/mips/basler/excite/excite_iodev.c b/arch/mips/basler/excite/excite_iodev.c
index 476d20e08d0e..a1e3526b4a94 100644
--- a/arch/mips/basler/excite/excite_iodev.c
+++ b/arch/mips/basler/excite/excite_iodev.c
@@ -26,6 +26,7 @@
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <linux/miscdevice.h>
+#include <linux/smp_lock.h>
#include "excite_iodev.h"
@@ -110,8 +111,14 @@ static int __exit iodev_remove(struct device *dev)
static int iodev_open(struct inode *i, struct file *f)
{
- return request_irq(iodev_irq, iodev_irqhdl, IRQF_DISABLED,
+ int ret;
+
+ lock_kernel();
+ ret = request_irq(iodev_irq, iodev_irqhdl, IRQF_DISABLED,
iodev_name, &miscdev);
+ unlock_kernel();
+
+ return ret;
}
static int iodev_release(struct inode *i, struct file *f)