---

yaml --- r: 213580 b: refs/heads/master c: 969afff h: refs/heads/master v: v3
git-mirror · Oct 22, 2010 · 5fce3b1 · 5fce3b1
1 parent 9d8ebf4
commit 5fce3b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5dcd531ac7a040f1b4d35f58914a36ad6174e84
+refs/heads/master: 969affff54702785330de553b790372e261e93f9
diff --git a/trunk/drivers/usb/gadget/atmel_usba_udc.c b/trunk/drivers/usb/gadget/atmel_usba_udc.c
@@ -2015,6 +2015,9 @@ static int __init usba_udc_probe(struct platform_device *pdev)
 			} else {
 				disable_irq(gpio_to_irq(udc->vbus_pin));
 			}
+		} else {
+			/* gpio_request fail so use -EINVAL for gpio_is_valid */
+			ubc->vbus_pin = -EINVAL;
 		}
 	}