From: Mike Lockwood <lockwood@android.com>
Date: Mon, 8 Feb 2010 10:33:54 +0000 (-0500)
Subject: USB: gadget: Disable RNDIS function by default if CONFIG_USB_ANDROID_RNDIS is set
X-Git-Tag: firefly_0821_release~11647
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cb7536857381c2eb10ecb4c1d14d2ef274baa75c;p=firefly-linux-kernel-4.4.55.git

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

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

diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index af67a0096e09..67a923fce6f0 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -826,6 +826,11 @@ int __init 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);