diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-13 20:28:05 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-13 20:28:05 -0400 |
| commit | db9ca5803566078aafe63cf364ef98b5097e4194 (patch) | |
| tree | ce330cdf21728f00801004e3900c79e4195cd516 /drivers/usb/host/ohci-pxa27x.c | |
| parent | bf717b11aec20965d48dea36dea3eea18a75d18c (diff) | |
| parent | eb35cf60e462491249166182e3e755d3d5d91a28 (diff) | |
| download | kernel-crypto-db9ca5803566078aafe63cf364ef98b5097e4194.tar.gz kernel-crypto-db9ca5803566078aafe63cf364ef98b5097e4194.tar.xz kernel-crypto-db9ca5803566078aafe63cf364ef98b5097e4194.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/host/ohci-pxa27x.c')
| -rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index acde8868da2..fafe7c1265b 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c @@ -185,6 +185,9 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device /* Select Power Management Mode */ pxa27x_ohci_select_pmm(inf->port_mode); + if (inf->power_budget) + hcd->power_budget = inf->power_budget; + ohci_hcd_init(hcd_to_ohci(hcd)); retval = usb_add_hcd(hcd, pdev->resource[1].start, SA_INTERRUPT); |