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
84ac64f
..
f6e6aca
100644
(file)
--- a/
drivers/char/ppdev.c
+++ b/
drivers/char/ppdev.c
@@
-66,7
+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/
device
.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"
@@
-268,9
+268,9
@@
static ssize_t pp_write (struct file * file, const char __user * buf,
return bytes_written;
}
return bytes_written;
}
-static void pp_irq (
int irq, void *
private)
+static void pp_irq (
void *
private)
{
{
- struct pp_struct *
pp = (struct pp_struct *)
private;
+ struct pp_struct *
pp =
private;
if (pp->irqresponse) {
parport_write_control (pp->pdev->port, pp->irqctl);
if (pp->irqresponse) {
parport_write_control (pp->pdev->port, pp->irqctl);
@@
-639,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;