---

yaml --- r: 322698 b: refs/heads/master c: 6fffb77 h: refs/heads/master v: v3
git-mirror · Sep 5, 2012 · 1c4dd17 · 1c4dd17
1 parent 7ba4fe1
commit 1c4dd17
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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];