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
/
ppdev.c
diff --git
a/drivers/char/ppdev.c
b/drivers/char/ppdev.c
index
3aab837
..
f6e6aca
100644
(file)
--- a/
drivers/char/ppdev.c
+++ b/
drivers/char/ppdev.c
@@
-66,6
+66,7
@@
#include <linux/poll.h>
#include <linux/major.h>
#include <linux/ppdev.h>
#include <linux/poll.h>
#include <linux/major.h>
#include <linux/ppdev.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#define PP_VERSION "ppdev: user-space parallel port driver"
#include <asm/uaccess.h>
#define PP_VERSION "ppdev: user-space parallel port driver"
@@
-638,6
+639,7
@@
static int pp_open (struct inode * inode, struct file * file)
unsigned int minor = iminor(inode);
struct pp_struct *pp;
unsigned int minor = iminor(inode);
struct pp_struct *pp;
+ cycle_kernel_lock();
if (minor >= PARPORT_MAX)
return -ENXIO;
if (minor >= PARPORT_MAX)
return -ENXIO;