usb: musb: Fix bad call to kfree() in musb_free
authorBrian Downing <bdowning@lavos.net>
Sat, 4 Aug 2012 23:32:19 +0000 (18:32 -0500)
committerGrazvydas Ignotas <notasas@gmail.com>
Tue, 12 Mar 2013 21:45:51 +0000 (23:45 +0200)
Commit 622859634a663c5e55d0e2a2cdbb55ac058d97b3 (usb: musb: drop a
gigantic amount of ifdeferry) included this change:

    @@ -1901,11 +1844,7 @@ static void musb_free(struct musb *musb)
                    dma_controller_destroy(c);
            }

    -#ifdef CONFIG_USB_MUSB_HDRC_HCD
    -       usb_put_hcd(musb_to_hcd(musb));
    -#else
            kfree(musb);
    -#endif
     }

     /*

Since musb comes from struct usb_hcd's hcd_priv, which is allocated on
the end of that struct, kfree'ing it is not going to work.  Replace
kfree(musb) with usb_put_hcd(musb_to_hcd(musb)), which appears to be
the right thing to do here.

Signed-off-by: Brian Downing <bdowning@lavos.net>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/musb/musb_core.c

index 35eaa2e..35e30e1 100644 (file)
@@ -1907,7 +1907,7 @@ static void musb_free(struct musb *musb)
                dma_controller_destroy(c);
        }
 
                dma_controller_destroy(c);
        }
 
-       kfree(musb);
+       usb_put_hcd(musb_to_hcd(musb));
 }
 
 /*
 }
 
 /*