1 files changed, 27 insertions, 2 deletions

diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index c14a69b36d27..3d583a10b926 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -215,6 +215,7 @@ struct usb_ep {
         struct list_head        ep_list;
         struct usb_ep_caps      caps;
         bool                    claimed;
+        bool                    enabled;
         unsigned                maxpacket:16;
         unsigned                maxpacket_limit:16;
         unsigned                max_streams:16;
@@ -264,7 +265,18 @@ static inline void usb_ep_set_maxpacket_limit(struct usb_ep *ep,
  */
 static inline int usb_ep_enable(struct usb_ep *ep)
 {
-        return ep->ops->enable(ep, ep->desc);
+        int ret;
+
+        if (ep->enabled)
+                return 0;
+
+        ret = ep->ops->enable(ep, ep->desc);
+        if (ret)
+                return ret;
+
+        ep->enabled = true;
+
+        return 0;
 }
 
 /**
@@ -281,7 +293,18 @@ static inline int usb_ep_enable(struct usb_ep *ep)
  */
 static inline int usb_ep_disable(struct usb_ep *ep)
 {
-        return ep->ops->disable(ep);
+        int ret;
+
+        if (!ep->enabled)
+                return 0;
+
+        ret = ep->ops->disable(ep);
+        if (ret)
+                return ret;
+
+        ep->enabled = false;
+
+        return 0;
 }
 
 /**
@@ -1233,6 +1256,8 @@ extern struct usb_ep *usb_ep_autoconfig_ss(struct usb_gadget *,
                         struct usb_endpoint_descriptor *,
                         struct usb_ss_ep_comp_descriptor *);
 
+extern void usb_ep_autoconfig_release(struct usb_ep *);
+
 extern void usb_ep_autoconfig_reset(struct usb_gadget *);
 
 #endif /* __LINUX_USB_GADGET_H */