Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / usb / host / ohci-sm501.c

diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index cff23637cfcc5e6cd5322d8faddd866f885b9e27..041d30f30c1045830f6db43de606c62390a497b5 100644 (file)
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -168,7 +168,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
 
        retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
        if (retval)
-               goto err4;
+               goto err5;
 
        /* enable power and unmask interrupts */
 
@@ -176,6 +176,8 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
        sm501_modify_reg(dev->parent, SM501_IRQ_MASK, 1 << 6, 0);
 
        return 0;
+err5:
+       iounmap(hcd->regs);
 err4:
        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
 err3: