Sophie

Sophie

distrib > Mandriva > 2010.1 > x86_64 > media > non-free-release-src > by-pkgid > 9c70485eacbbe9dfb029290fa5f23c3e > files > 2

dkms-fcdsl-3.11.07-6mdv2008.1.src.rpm

Fix device_interrupt to match updated irq_handler_t.

See commit 7d12e780e003f93433d49ce78cfedf4b4c52adc5 that went in
Linux 2.6.19

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>

--- fcdsl-3.11.07.orig/driver.c	2008-01-05 22:06:10.000000000 -0200
+++ fcdsl-3.11.07/driver.c	2008-01-05 22:09:35.000000000 -0200
@@ -122,7 +122,7 @@ static void			tx_task (unsigned long dat
 static void			rx_task (unsigned long data);
 static void			tx_handler (card_p cp);
 static void			rx_handler (card_p cp);
-static irqreturn_t		irq_handler (int, void *, struct pt_regs *);
+static irqreturn_t		irq_handler (int, void *);
 static void			enable_thread (void);
 static void			disable_thread (void);
 static int			make_thread (void);
@@ -1550,7 +1550,7 @@ static void rx_task (unsigned long data)
 
 /*---------------------------------------------------------------------------*\
 \*---------------------------------------------------------------------------*/
-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
+static irqreturn_t irq_handler (int irq, void * args) {
 	unsigned long	flags;
 	int		tx_flag	= 0;
 	int		rx_flag	= 0;
@@ -1558,7 +1558,6 @@ static irqreturn_t irq_handler (int irq,
 	card_p		cp;
 	
 	UNUSED_ARG (irq);
-	UNUSED_ARG (regs);
 	if (capi_card != (card_p) args) {
 		return IRQ_NONE;
 	}