From 324b4644d4725f35dc2f878dd99cf94986f1911d Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 19 Nov 2007 22:28:15 +0000
Subject: [PATCH] --- yaml --- r: 74339 b: refs/heads/master c:
 5f629ad7e5f9b99c6d025bf199d402734bd72d0f h: refs/heads/master i:   74337:
 728ac9232236b718598c6c05f2dc02789e66a99b   74335:
 1c695d89d1522da654ba470e7852e73c851be924 v: v3

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

diff --git a/[refs] b/[refs]
index 55624d7b6b92..1ec389c4e3b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8802bca4feed9e60d22a91cc5ccb1c4a1d8e3d71
+refs/heads/master: 5f629ad7e5f9b99c6d025bf199d402734bd72d0f
diff --git a/trunk/drivers/usb/gadget/s3c2410_udc.c b/trunk/drivers/usb/gadget/s3c2410_udc.c
index 5acaddabbe8f..4ce050c3d13f 100644
--- a/trunk/drivers/usb/gadget/s3c2410_udc.c
+++ b/trunk/drivers/usb/gadget/s3c2410_udc.c
@@ -1511,7 +1511,11 @@ static irqreturn_t s3c2410_udc_vbus_irq(int irq, void *_dev)
 	unsigned int		value;
 
 	dprintk(DEBUG_NORMAL, "%s()\n", __func__);
+
+	/* some cpus cannot read from an line configured to IRQ! */
+	s3c2410_gpio_cfgpin(udc_info->vbus_pin, S3C2410_GPIO_INPUT);
 	value = s3c2410_gpio_getpin(udc_info->vbus_pin);
+	s3c2410_gpio_cfgpin(udc_info->vbus_pin, S3C2410_GPIO_SFN2);
 
 	if (udc_info->vbus_pin_inverted)
 		value = !value;