From 2b2aa354b318b8f8b1c035bfbc94501871ac1cb7 Mon Sep 17 00:00:00 2001
From: David Cross <david.cross@cypress.com>
Date: Thu, 23 Sep 2010 17:20:00 -0700
Subject: [PATCH] --- yaml --- r: 219987 b: refs/heads/master c:
 9ebed608bde8e27a1993f1b12eff16e04c8c419e h: refs/heads/master i:   219985:
 46069bff859434f98a9c41665ac4d6b8fd2f07dc   219983:
 97f6c50792d99541ef99e7d9003c8c2ea2e10c97 v: v3

---
 [refs]                                                |  2 +-
 .../staging/westbridge/astoria/gadget/cyasgadget.c    | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 91da88547555..9973bc7415e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a06b1414a4d1850244827dc61382f44525151e92
+refs/heads/master: 9ebed608bde8e27a1993f1b12eff16e04c8c419e
diff --git a/trunk/drivers/staging/westbridge/astoria/gadget/cyasgadget.c b/trunk/drivers/staging/westbridge/astoria/gadget/cyasgadget.c
index 756ff278f66d..0b00271cbebe 100644
--- a/trunk/drivers/staging/westbridge/astoria/gadget/cyasgadget.c
+++ b/trunk/drivers/staging/westbridge/astoria/gadget/cyasgadget.c
@@ -1882,9 +1882,8 @@ static void cyas_ep0_start(
  * disconnect is reported.  then a host may connect again, or
  * the driver might get unbound.
  */
-int usb_gadget_register_driver(
-				struct usb_gadget_driver *driver
-				)
+int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
+		int (*bind)(struct usb_gadget *))
 {
 	cyasgadget *dev = cy_as_gadget_controller ;
 	int		retval;
@@ -1898,7 +1897,7 @@ int usb_gadget_register_driver(
 	* "must not be used in normal operation"
 	*/
 	if (!driver
-		|| !driver->bind
+		|| !bind
 		|| !driver->unbind
 		|| !driver->setup)
 		return -EINVAL;
@@ -1919,7 +1918,7 @@ int usb_gadget_register_driver(
 	cyas_usb_reset(dev) ; /* External usb */
 	cyas_usb_reinit(dev) ; /* Internal */
 
-	retval = driver->bind(&dev->gadget);
+	retval = bind(&dev->gadget);
 	if (retval) {
 		#ifndef WESTBRIDGE_NDEBUG
 		cy_as_hal_print_message("%s bind to driver %s --> %d\n",
@@ -1938,7 +1937,7 @@ int usb_gadget_register_driver(
 
 	return 0;
 }
-EXPORT_SYMBOL(usb_gadget_register_driver);
+EXPORT_SYMBOL(usb_gadget_probe_driver);
 
 static void cyasgadget_nuke(
 							cyasgadget_ep *an_ep