Commit 6fffb77c authored Aug 29, 2012 by Nicolas Ferre Committed by Greg Kroah-Hartman Sep 05, 2012

USB: ohci-at91: fix PIO handling in relation with number of ports



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 0ee6d1ee (USB: ohci-at91:
change maximum number of ports) that did not modified the associatd
board files.

Reported-by: Klaus Falkner <klaus.falkner@solectrix.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Stable <stable@vger.kernel.org> [3.4+]
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 26a538b9

drivers/usb/host/ohci-at91.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -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];

Admin message