diff --git a/[refs] b/[refs] index 71e497fbf08f..ec5bc47081b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06e182911da95a304eaab71288a47bc5c799c4eb +refs/heads/master: b2b608090544ecd30a826c32958bca74fb717963 diff --git a/trunk/drivers/usb/host/ehci-omap.c b/trunk/drivers/usb/host/ehci-omap.c index 7ba8df3c6d78..12f1ad2fd0e8 100644 --- a/trunk/drivers/usb/host/ehci-omap.c +++ b/trunk/drivers/usb/host/ehci-omap.c @@ -558,7 +558,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) omap = kzalloc(sizeof(*omap), GFP_KERNEL); if (!omap) { ret = -ENOMEM; - goto err_create_hcd; + goto err_disabled; } hcd = usb_create_hcd(&ehci_omap_hc_driver, &pdev->dev, @@ -653,6 +653,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) usb_put_hcd(hcd); err_create_hcd: + kfree(omap); err_disabled: err_pdata: return ret;