From 1c4dd1717fa817b54022729e4d0d24231ace03a9 Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Wed, 29 Aug 2012 11:49:18 +0200
Subject: [PATCH] --- yaml --- r: 322698 b: refs/heads/master c:
 6fffb77c8393151b0cf8cef1b9c2ba90587dd2e8 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/host/ohci-at91.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4e2152180738..2a83e50fd3c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26a538b9ea2a3ee10dafc0068f0560dfd7b7ba37
+refs/heads/master: 6fffb77c8393151b0cf8cef1b9c2ba90587dd2e8
diff --git a/trunk/drivers/usb/host/ohci-at91.c b/trunk/drivers/usb/host/ohci-at91.c
index a665b3eaa746..aaa8d2bce217 100644
--- a/trunk/drivers/usb/host/ohci-at91.c
+++ b/trunk/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];