projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into release
[linux-2.6-block.git]
/
drivers
/
char
/
scx200_gpio.c
diff --git
a/drivers/char/scx200_gpio.c
b/drivers/char/scx200_gpio.c
index 99e5272e3c53e1ef1aa32f0733b1bbf0e9f2487e..1d9100561c8a3e70cd4132d153b73164232bb4f4 100644
(file)
--- a/
drivers/char/scx200_gpio.c
+++ b/
drivers/char/scx200_gpio.c
@@
-12,6
+12,7
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/io.h>
@@
-51,6
+52,7
@@
static int scx200_gpio_open(struct inode *inode, struct file *file)
unsigned m = iminor(inode);
file->private_data = &scx200_gpio_ops;
unsigned m = iminor(inode);
file->private_data = &scx200_gpio_ops;
+ cycle_kernel_lock();
if (m >= MAX_PINS)
return -EINVAL;
return nonseekable_open(inode, file);
if (m >= MAX_PINS)
return -EINVAL;
return nonseekable_open(inode, file);