Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / drivers / isdn / sc / init.c

diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c
index 0bf76344a0d54fcbd00752fc65d2a1b4f390332f..dd0acd06750b2fd614e242e83e6df125cbfb7338 100644 (file)
--- a/drivers/isdn/sc/init.c
+++ b/drivers/isdn/sc/init.c
@@ -334,7 +334,8 @@ static int __init sc_init(void)
                 */
                sc_adapter[cinst]->interrupt = irq[b];
                if (request_irq(sc_adapter[cinst]->interrupt, interrupt_handler,
-                               IRQF_DISABLED, interface->id, NULL))
+                               IRQF_DISABLED, interface->id,
+                               (void *)(unsigned long) cinst))
                {
                        kfree(sc_adapter[cinst]->channel);
                        indicate_status(cinst, ISDN_STAT_UNLOAD, 0, NULL);      /* Fix me */
@@ -404,7 +405,7 @@ static void __exit sc_exit(void)
                /*
                 * Release the IRQ
                 */
-               FREE_IRQ(sc_adapter[i]->interrupt, NULL);
+               free_irq(sc_adapter[i]->interrupt, NULL);
 
                /*
                 * Reset for a clean start