From fd095d09f2d475dc2e8599b1b8bae1cd65e91685 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 1 Dec 1997 04:02:08 +0000 Subject: Merge with 2.1.56 as first part of merging back my code. --- drivers/char/amigamouse.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'drivers/char/amigamouse.c') 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); -- cgit v1.2.3