From cb7536857381c2eb10ecb4c1d14d2ef274baa75c Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 8 Feb 2010 05:33:54 -0500 Subject: [PATCH] USB: gadget: Disable RNDIS function by default if CONFIG_USB_ANDROID_RNDIS is set Signed-off-by: Mike Lockwood --- drivers/usb/gadget/f_rndis.c | 5 +++++ 1 file changed, 5 insertions(+) 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); -- 2.34.1