usb: ether_gadget: fix insmod panic after fsg rmmod

Fixes kernel panic seen during g_ether.ko module insertion performed
after the FSG gadget rmmod.

Ether gadget doesn't reset the usb_ep(s) during initialization and
so was getting the previous gadget's usb_ep->desc data.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>

diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 753aa0683ac12c483ed34e23543063182bc15536..a9f58da54304cc51866ecd2f067f51a3a3bdaa6b 100644 (file)
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -380,6 +380,7 @@ void usb_ep_autoconfig_reset (struct usb_gadget *gadget)
 
        list_for_each_entry (ep, &gadget->ep_list, ep_list) {
                ep->driver_data = NULL;
+               ep->desc = NULL;
        }
 #ifdef MANY_ENDPOINTS
        in_epnum = 0;

diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
index 11c07cb7d3372b967725dbaf1c3d236193603433..58d91729a34ae4661a0fa0fbb7759852fb610130 100644 (file)
--- a/drivers/usb/gadget/f_ecm.c
+++ b/drivers/usb/gadget/f_ecm.c
@@ -690,6 +690,7 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)
        status = -ENODEV;
 
        /* allocate instance-specific endpoints */
+       usb_ep_autoconfig_reset(cdev->gadget);
        ep = usb_ep_autoconfig(cdev->gadget, &fs_ecm_in_desc);
        if (!ep)
                goto fail;

diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index b6e6dac0d3376629947aab6ec35194f9535cc1d6..661449003cc289ce56b6c4f201f770129ef2542f 100644 (file)
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -684,6 +684,7 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
        status = -ENODEV;
 
        /* allocate instance-specific endpoints */
+       usb_ep_autoconfig_reset(cdev->gadget);
        ep = usb_ep_autoconfig(cdev->gadget, &fs_in_desc);
        if (!ep)
                goto fail;

diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
index c1540648125a8c24f91317612806a17aae827c44..85bd9bd7081d41fee33e93f0cca53ec67a73490c 100644 (file)
--- a/drivers/usb/gadget/f_subset.c
+++ b/drivers/usb/gadget/f_subset.c
@@ -307,6 +307,7 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
        status = -ENODEV;
 
        /* allocate instance-specific endpoints */
+       usb_ep_autoconfig_reset(cdev->gadget);
        ep = usb_ep_autoconfig(cdev->gadget, &fs_subset_in_desc);
        if (!ep)
                goto fail;