summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/f_rndis.c
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-02-08 05:33:54 -0500
committerColin Cross <ccross@android.com>2011-06-14 09:08:56 -0700
commitfe8ae898476eb9c5ed731cce539194e66393cd11 (patch)
treee1f18096058e406b642f96f824f15380271e5c6b /drivers/usb/gadget/f_rndis.c
parent053297308f600fe8e986547ab0a90ee7cd6bf5d3 (diff)
USB: gadget: Disable RNDIS function by default if CONFIG_USB_ANDROID_RNDIS is set
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'drivers/usb/gadget/f_rndis.c')
-rw-r--r--drivers/usb/gadget/f_rndis.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 39d2df570e8..4cfa8b6b9c7 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -850,6 +850,11 @@ rndis_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
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);