diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
| commit | fd095d09f2d475dc2e8599b1b8bae1cd65e91685 (patch) | |
| tree | 217f87a997699505e0dd752931409b9f10fffe65 /drivers/char/amigamouse.c | |
| parent | c02e0599c4233f97071928f8118841954bacdadf (diff) | |
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'drivers/char/amigamouse.c')
| -rw-r--r-- | drivers/char/amigamouse.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/char/amigamouse.c b/drivers/char/amigamouse.c index 602695c39..6977d2398 100644 --- a/drivers/char/amigamouse.c +++ b/drivers/char/amigamouse.c @@ -159,11 +159,10 @@ static void mouse_interrupt(int irq, void *dummy, struct pt_regs *fp) MSE_INT_ON(); } -static int fasync_mouse(struct inode *inode, struct file *filp, int on) +static int fasync_mouse(struct file *filp, int on) { int retval; - - retval = fasync_helper(inode, filp, on, &mouse.fasyncptr); + retval = fasync_helper(filp, on, &mouse.fasyncptr); if (retval < 0) return retval; return 0; @@ -175,7 +174,7 @@ static int fasync_mouse(struct inode *inode, struct file *filp, int on) static int release_mouse(struct inode * inode, struct file * file) { - fasync_mouse(inode, file, 0); + fasync_mouse(file, 0); if (--mouse.active) return 0; free_irq(IRQ_AMIGA_VERTB, mouse_interrupt); |