git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
input
/
mouse
/
pc110pad.c
diff --git
a/drivers/input/mouse/pc110pad.c
b/drivers/input/mouse/pc110pad.c
index
910e035
..
fa8cff3
100644
(file)
--- a/
drivers/input/mouse/pc110pad.c
+++ b/
drivers/input/mouse/pc110pad.c
@@
-98,9
+98,9
@@
static int pc110pad_open(struct input_dev *dev)
if (pc110pad_used++)
return 0;
if (pc110pad_used++)
return 0;
- pc110pad_interrupt(0,
0,0
);
- pc110pad_interrupt(0,
0,0
);
- pc110pad_interrupt(0,
0,0
);
+ pc110pad_interrupt(0,
NULL,NULL
);
+ pc110pad_interrupt(0,
NULL,NULL
);
+ pc110pad_interrupt(0,
NULL,NULL
);
outb(PC110PAD_ON, pc110pad_io + 2);
pc110pad_count = 0;
outb(PC110PAD_ON, pc110pad_io + 2);
pc110pad_count = 0;
@@
-109,15
+109,15
@@
static int pc110pad_open(struct input_dev *dev)
static int __init pc110pad_init(void)
{
static int __init pc110pad_init(void)
{
- if (
request_region(pc110pad_io, 4, "pc110pad"))
- {
-
printk(KERN_ERR "pc110pad: I/O area %#x-%#x in use.\n",
pc110pad_io, pc110pad_io + 4);
+ if (
!request_region(pc110pad_io, 4, "pc110pad")) {
+ printk(KERN_ERR "pc110pad: I/O area %#x-%#x in use.\n",
+
pc110pad_io, pc110pad_io + 4);
return -EBUSY;
}
outb(PC110PAD_OFF, pc110pad_io + 2);
return -EBUSY;
}
outb(PC110PAD_OFF, pc110pad_io + 2);
- if (request_irq(pc110pad_irq, pc110pad_interrupt, 0, "pc110pad",
0
))
+ if (request_irq(pc110pad_irq, pc110pad_interrupt, 0, "pc110pad",
NULL
))
{
release_region(pc110pad_io, 4);
printk(KERN_ERR "pc110pad: Unable to get irq %d.\n", pc110pad_irq);
{
release_region(pc110pad_io, 4);
printk(KERN_ERR "pc110pad: Unable to get irq %d.\n", pc110pad_irq);
@@
-155,7
+155,7
@@
static void __exit pc110pad_exit(void)
outb(PC110PAD_OFF, pc110pad_io + 2);
outb(PC110PAD_OFF, pc110pad_io + 2);
- free_irq(pc110pad_irq,
0
);
+ free_irq(pc110pad_irq,
NULL
);
release_region(pc110pad_io, 4);
}
release_region(pc110pad_io, 4);
}