diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-04 14:54:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-04 14:54:56 +0100 |
| commit | bb960a1e42042e82447a5bc0941b3ab6d614bac3 (patch) | |
| tree | d2295a923fabb1b01b25bb015c4c2e42ee9df5ca /drivers/usb/host/ohci-omap.c | |
| parent | 858770619debfb9269add63e4ba8b7c6b5538dd1 (diff) | |
| parent | 06fc732c33a7ff5e4c91bcf4a6ca86b5e335ad9a (diff) | |
Merge branch 'core/xen' into x86/urgent
Diffstat (limited to 'drivers/usb/host/ohci-omap.c')
| -rw-r--r-- | drivers/usb/host/ohci-omap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 4bbddb73abd9..f3aaba35e912 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -315,14 +315,14 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver, return -ENODEV; } - usb_host_ck = clk_get(0, "usb_hhc_ck"); + usb_host_ck = clk_get(&pdev->dev, "usb_hhc_ck"); if (IS_ERR(usb_host_ck)) return PTR_ERR(usb_host_ck); if (!cpu_is_omap15xx()) - usb_dc_ck = clk_get(0, "usb_dc_ck"); + usb_dc_ck = clk_get(&pdev->dev, "usb_dc_ck"); else - usb_dc_ck = clk_get(0, "lb_ck"); + usb_dc_ck = clk_get(&pdev->dev, "lb_ck"); if (IS_ERR(usb_dc_ck)) { clk_put(usb_host_ck); |