From 5fce3b194f3084773a1d3e76f4ca0d476f81526c Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Mon, 20 Sep 2010 18:31:07 +0200
Subject: [PATCH] --- yaml --- r: 213580 b: refs/heads/master c:
 969affff54702785330de553b790372e261e93f9 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/usb/gadget/atmel_usba_udc.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d5f20eb14675..8c6fdb6ca07d 100644
--- 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
index e4810c6a0b1f..b5e20e873cba 100644
--- 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;
 		}
 	}