Merge tag 'gadget-for-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[karo-tx-linux.git] / drivers / usb / renesas_usbhs / mod.c

diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c
index 61933a90e5bfdbe41fed1679979977e6ff849b4b..6a030b931a3b71d721870181d1170ba451dacc8b 100644 (file)
--- a/drivers/usb/renesas_usbhs/mod.c
+++ b/drivers/usb/renesas_usbhs/mod.c
@@ -151,7 +151,7 @@ int usbhs_mod_probe(struct usbhs_priv *priv)
                goto mod_init_host_err;
 
        /* irq settings */
-       ret = request_irq(priv->irq, usbhs_interrupt,
+       ret = devm_request_irq(dev, priv->irq, usbhs_interrupt,
                          priv->irqflags, dev_name(dev), priv);
        if (ret) {
                dev_err(dev, "irq request err\n");
@@ -172,7 +172,6 @@ void usbhs_mod_remove(struct usbhs_priv *priv)
 {
        usbhs_mod_host_remove(priv);
        usbhs_mod_gadget_remove(priv);
-       free_irq(priv->irq, priv);
 }
 
 /*