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 31f29dc14bbef03e54e4c403221368980540b417..89e2b7fb4f3155397a0a2094f20ba332055cd1eb 100644 (file)
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -851,6 +851,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);