Merge remote-tracking branch 'target-updates/for-next'

[karo-tx-linux.git] / drivers / usb / gadget / function / f_subset.c

diff --git a/drivers/usb/gadget/function/f_subset.c b/drivers/usb/gadget/function/f_subset.c
index 055e4eaf80ae1609479b0d0d2f7f273920a00947..829c78de9ebac728919784951b89d05d7d942361 100644 (file)
--- a/drivers/usb/gadget/function/f_subset.c
+++ b/drivers/usb/gadget/function/f_subset.c
@@ -262,7 +262,7 @@ static int geth_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 
        /* we know alt == 0, so this is an activation or a reset */
 
-       if (geth->port.in_ep->driver_data) {
+       if (geth->port.in_ep->enabled) {
                DBG(cdev, "reset cdc subset\n");
                gether_disconnect(&geth->port);
        }
@@ -343,13 +343,11 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
        if (!ep)
                goto fail;
        geth->port.in_ep = ep;
-       ep->driver_data = cdev; /* claim */
 
        ep = usb_ep_autoconfig(cdev->gadget, &fs_subset_out_desc);
        if (!ep)
                goto fail;
        geth->port.out_ep = ep;
-       ep->driver_data = cdev; /* claim */
 
        /* support all relevant hardware speeds... we expect that when
         * hardware is dual speed, all bulk-capable endpoints work at
@@ -380,12 +378,6 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
        return 0;
 
 fail:
-       /* we might as well release our claims on endpoints */
-       if (geth->port.out_ep)
-               geth->port.out_ep->driver_data = NULL;
-       if (geth->port.in_ep)
-               geth->port.in_ep->driver_data = NULL;
-
        ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
 
        return status;