git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into x86/urgent
[pandora-kernel.git]
/
drivers
/
char
/
cs5535_gpio.c
diff --git
a/drivers/char/cs5535_gpio.c
b/drivers/char/cs5535_gpio.c
index
c0a4a0b
..
04ba906
100644
(file)
--- a/
drivers/char/cs5535_gpio.c
+++ b/
drivers/char/cs5535_gpio.c
@@
-17,6
+17,7
@@
#include <linux/cdev.h>
#include <linux/ioport.h>
#include <linux/pci.h>
#include <linux/cdev.h>
#include <linux/ioport.h>
#include <linux/pci.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/io.h>
@@
-157,6
+158,7
@@
static int cs5535_gpio_open(struct inode *inode, struct file *file)
{
u32 m = iminor(inode);
{
u32 m = iminor(inode);
+ cycle_kernel_lock();
/* the mask says which pins are usable by this driver */
if ((mask & (1 << m)) == 0)
return -EINVAL;
/* the mask says which pins are usable by this driver */
if ((mask & (1 << m)) == 0)
return -EINVAL;