]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
USB: musb free_irq bugfix
authorAjay Kumar Gupta <ajay.gupta@ti.com>
Sun, 25 Jan 2009 01:56:39 +0000 (17:56 -0800)
committerGreg Kroah-Hartman <gregkh@kvm.kroah.org>
Wed, 28 Jan 2009 00:15:33 +0000 (16:15 -0800)
Fixes insert module failure as free_irq() was not
done in previous rmmod.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/musb/musb_core.c

index 6c7faacfb535a78b01f67616ab56b7c02ee05bd7..2cc34fa05b7391813cb386342849b15bab714bc5 100644 (file)
@@ -1824,8 +1824,9 @@ static void musb_free(struct musb *musb)
        musb_gadget_cleanup(musb);
 #endif
 
-       if (musb->nIrq >= 0 && musb->irq_wake) {
-               disable_irq_wake(musb->nIrq);
+       if (musb->nIrq >= 0) {
+               if (musb->irq_wake)
+                       disable_irq_wake(musb->nIrq);
                free_irq(musb->nIrq, musb);
        }
        if (is_dma_capable() && musb->dma_controller) {