--- drivers/usb/host/ehci-ppc-of.c

+++ drivers/usb/host/ehci-ppc-of.c

@@ -192,17 +192,19 @@ ehci_hcd_ppc_of_probe(struct of_device *

}

rv = usb_add_hcd(hcd, irq, 0);

- if (rv == 0)

- return 0;

+ if (rv)

+ goto err_ehci;

+ return 0;

+

+err_ehci:

+ if (ehci->has_amcc_usb23)

+ iounmap(ehci->ohci_hcctrl_reg);

iounmap(hcd->regs);

err_ioremap:

irq_dispose_mapping(irq);

err_irq:

release_mem_region(hcd->rsrc_start, hcd->rsrc_len);

-

- if (ehci->has_amcc_usb23)

- iounmap(ehci->ohci_hcctrl_reg);

err_rmr:

usb_put_hcd(hcd);