[PATCH] USB: ohci-at91: fix PIO handling in relation with number of ports
From: Nicolas Ferre <hidden>
Date: 2012-09-04 08:27:34
Also in:
lkml
On 08/29/2012 11:49 AM, Nicolas Ferre :
If the number of ports present on the SoC/board is not the maximum and that the platform data is not filled with all data, there is an easy way to mess the PIO setup for this interface. This quick fix addresses mis-configuration in USB host platform data that is common in at91 boards since commit 0ee6d1e (USB: ohci-at91: change maximum number of ports) that did not modified the associatd board files. Reported-by: Klaus Falkner <redacted> Signed-off-by: Nicolas Ferre <redacted> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-usb at vger.kernel.org Cc: Stable <redacted> [3.4+]
Alan, Greg, gentle ping... I really would like to seen it landing in stable soon... Thanks, best regards,
quoted hunk ↗ jump to hunk
--- drivers/usb/host/ohci-at91.c | 10 ++++++++++ 1 file changed, 10 insertions(+)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];
-- Nicolas Ferre