diff options
-rw-r--r-- | drivers/isdn/sc/init.c | 3 | ||||
-rw-r--r-- | drivers/isdn/sc/interrupt.c | 17 |
2 files changed, 4 insertions, 16 deletions
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c index d09c854cfac7..dd0acd06750b 100644 --- a/drivers/isdn/sc/init.c +++ b/drivers/isdn/sc/init.c | |||
@@ -334,7 +334,8 @@ static int __init sc_init(void) | |||
334 | */ | 334 | */ |
335 | sc_adapter[cinst]->interrupt = irq[b]; | 335 | sc_adapter[cinst]->interrupt = irq[b]; |
336 | if (request_irq(sc_adapter[cinst]->interrupt, interrupt_handler, | 336 | if (request_irq(sc_adapter[cinst]->interrupt, interrupt_handler, |
337 | IRQF_DISABLED, interface->id, NULL)) | 337 | IRQF_DISABLED, interface->id, |
338 | (void *)(unsigned long) cinst)) | ||
338 | { | 339 | { |
339 | kfree(sc_adapter[cinst]->channel); | 340 | kfree(sc_adapter[cinst]->channel); |
340 | indicate_status(cinst, ISDN_STAT_UNLOAD, 0, NULL); /* Fix me */ | 341 | indicate_status(cinst, ISDN_STAT_UNLOAD, 0, NULL); /* Fix me */ |
diff --git a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c index bef7963cdd02..485be8b1e1b3 100644 --- a/drivers/isdn/sc/interrupt.c +++ b/drivers/isdn/sc/interrupt.c | |||
@@ -21,28 +21,15 @@ | |||
21 | #include "card.h" | 21 | #include "card.h" |
22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
23 | 23 | ||
24 | static int get_card_from_irq(int irq) | ||
25 | { | ||
26 | int i; | ||
27 | |||
28 | for(i = 0 ; i < cinst ; i++) { | ||
29 | if(sc_adapter[i]->interrupt == irq) | ||
30 | return i; | ||
31 | } | ||
32 | return -1; | ||
33 | } | ||
34 | |||
35 | /* | 24 | /* |
36 | * | 25 | * |
37 | */ | 26 | */ |
38 | irqreturn_t interrupt_handler(int interrupt, void *cardptr) | 27 | irqreturn_t interrupt_handler(int dummy, void *card_inst) |
39 | { | 28 | { |
40 | 29 | ||
41 | RspMessage rcvmsg; | 30 | RspMessage rcvmsg; |
42 | int channel; | 31 | int channel; |
43 | int card; | 32 | int card = (int)(unsigned long) card_inst; |
44 | |||
45 | card = get_card_from_irq(interrupt); | ||
46 | 33 | ||
47 | if(!IS_VALID_CARD(card)) { | 34 | if(!IS_VALID_CARD(card)) { |
48 | pr_debug("Invalid param: %d is not a valid card id\n", card); | 35 | pr_debug("Invalid param: %d is not a valid card id\n", card); |