USB: break apart flush_endpoint and disable_endpoint

[deliverable/linux.git] / drivers / usb / core / message.c

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index d638375e22e72d890da4bb971b64d38f521e0c14..98fcddba690895ebd4b850c03eed7747a09bad7e 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1017,7 +1017,8 @@ void usb_disable_endpoint(struct usb_device *dev, unsigned int epaddr)
        }
        if (ep) {
                ep->enabled = 0;
-               usb_hcd_endpoint_disable(dev, ep);
+               usb_hcd_flush_endpoint(dev, ep);
+               usb_hcd_disable_endpoint(dev, ep);
        }
 }