diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-10 22:40:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-10 22:40:04 +0100 |
| commit | b0efb42478c81ed0ed9aa0dc444db200c32624f0 (patch) | |
| tree | 79d45597910c636892f6e7bc710df6174ef54bc8 /drivers/usb/host/ohci-ep93xx.c | |
| parent | bd78512e5c0d202847ee3dba2fc3740676e196c7 (diff) | |
| parent | 4070243250dd06a96d874b0be3cb3a39ef23597c (diff) | |
| download | op-kernel-dev-b0efb42478c81ed0ed9aa0dc444db200c32624f0.zip op-kernel-dev-b0efb42478c81ed0ed9aa0dc444db200c32624f0.tar.gz | |
Merge branch 'ep93xx' into devel
Diffstat (limited to 'drivers/usb/host/ohci-ep93xx.c')
| -rw-r--r-- | drivers/usb/host/ohci-ep93xx.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index 7cf74f8..b0dbf41 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c @@ -47,7 +47,7 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver, struct usb_hcd *hcd; if (pdev->resource[1].flags != IORESOURCE_IRQ) { - pr_debug("resource[1] is not IORESOURCE_IRQ"); + dbg("resource[1] is not IORESOURCE_IRQ"); return -ENOMEM; } @@ -65,12 +65,18 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver, hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); if (hcd->regs == NULL) { - pr_debug("ioremap failed"); + dbg("ioremap failed"); retval = -ENOMEM; goto err2; } - usb_host_clock = clk_get(&pdev->dev, "usb_host"); + usb_host_clock = clk_get(&pdev->dev, NULL); + if (IS_ERR(usb_host_clock)) { + dbg("clk_get failed"); + retval = PTR_ERR(usb_host_clock); + goto err3; + } + ep93xx_start_hc(&pdev->dev); ohci_hcd_init(hcd_to_ohci(hcd)); @@ -80,6 +86,7 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver, return retval; ep93xx_stop_hc(&pdev->dev); +err3: iounmap(hcd->regs); err2: release_mem_region(hcd->rsrc_start, hcd->rsrc_len); |
