commit fe8ae898476eb9c5ed731cce539194e66393cd11
author Mike Lockwood <lockwood@android.com> Mon Feb 08 05:33:54 2010 -0500
committer Colin Cross <ccross@android.com> Tue Jun 14 09:08:56 2011 -0700
tree e1f18096058e406b642f96f824f15380271e5c6b
parent 053297308f600fe8e986547ab0a90ee7cd6bf5d3

USB: gadget: Disable RNDIS function by default if CONFIG_USB_ANDROID_RNDIS is set

Signed-off-by: Mike Lockwood <lockwood@android.com>

drivers/usb/gadget/f_rndis.c

diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 39d2df5..4cfa8b6 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -850,6 +850,11 @@
 	rndis->port.func.setup = rndis_setup;
 	rndis->port.func.disable = rndis_disable;
 
+#ifdef CONFIG_USB_ANDROID_RNDIS
+	/* start disabled */
+	rndis->port.func.hidden = 1;
+#endif
+
 	status = usb_add_function(c, &rndis->port.func);
 	if (status) {
 		kfree(rndis);