From: Mike Lockwood 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~7613^2~825 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe8ae898476eb9c5ed731cce539194e66393cd11;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 --- diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c index 39d2df570e88..4cfa8b6b9c79 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);