arch: omap: get rid of usb_init() protytpes
we now use usb_musb_init() and usb_ehci_init() functions
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
if (IS_ERR(host->iclk)) {
ret = PTR_ERR(host->iclk);
host->iclk = NULL;
if (IS_ERR(host->iclk)) {
ret = PTR_ERR(host->iclk);
host->iclk = NULL;
}
host->fclk = clk_get(&pdev->dev, "mmchs_fck");
if (IS_ERR(host->fclk)) {
ret = PTR_ERR(host->fclk);
host->fclk = NULL;
clk_put(host->iclk);
}
host->fclk = clk_get(&pdev->dev, "mmchs_fck");
if (IS_ERR(host->fclk)) {
ret = PTR_ERR(host->fclk);
host->fclk = NULL;
clk_put(host->iclk);
- if (clk_enable(host->fclk) != 0)
- goto err;
+ if (clk_enable(host->fclk) != 0) {
+ clk_put(host->iclk);
+ clk_put(host->fclk);
+ goto err1;
+ }
if (clk_enable(host->iclk) != 0) {
clk_disable(host->fclk);
if (clk_enable(host->iclk) != 0) {
clk_disable(host->fclk);
}
host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
}
host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
-err:
- dev_dbg(mmc_dev(host->mmc), "Probe Failed\n");
- if (host)
- mmc_free_host(mmc);
- return ret;
-
irq_err:
dev_dbg(mmc_dev(host->mmc), "Unable to configure MMC IRQs\n");
clk_disable(host->fclk);
irq_err:
dev_dbg(mmc_dev(host->mmc), "Unable to configure MMC IRQs\n");
clk_disable(host->fclk);
+err1:
+ iounmap(host->base);
+err:
+ dev_dbg(mmc_dev(host->mmc), "Probe Failed\n");
+ release_mem_region(res->start, res->end - res->start + 1);
if (host)
mmc_free_host(mmc);
return ret;
if (host)
mmc_free_host(mmc);
return ret;
}
mmc_free_host(host->mmc);
}
mmc_free_host(host->mmc);