diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 17:03:56 (GMT) |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 17:03:56 (GMT) |
| commit | 593d1006cdf710ab3469c0c37c184fea0bc3da97 (patch) | |
| tree | e4db58440018a52089e8d6b39160f753ab10df99 /drivers/usb/host/ohci-at91.c | |
| parent | 5217192b85480353aeeb395574e60d0db04f3676 (diff) | |
| parent | 9b20aa63b8fc9a6a3b6831f4eae3621755e51211 (diff) | |
| download | linux-fsl-qoriq-593d1006cdf710ab3469c0c37c184fea0bc3da97.tar.xz | |
Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b
Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.
Diffstat (limited to 'drivers/usb/host/ohci-at91.c')
| -rw-r--r-- | drivers/usb/host/ohci-at91.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index a665b3e..aaa8d2b 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -570,6 +570,16 @@ static int __devinit ohci_hcd_at91_drv_probe(struct platform_device *pdev) if (pdata) { at91_for_each_port(i) { + /* + * do not configure PIO if not in relation with + * real USB port on board + */ + if (i >= pdata->ports) { + pdata->vbus_pin[i] = -EINVAL; + pdata->overcurrent_pin[i] = -EINVAL; + break; + } + if (!gpio_is_valid(pdata->vbus_pin[i])) continue; gpio = pdata->vbus_pin[i]; |