1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 08d95e9d56c2..3cdcd0a2c0b7 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1293,8 +1293,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
         struct usb_interface *iface;
         struct usb_host_interface *alt;
         struct usb_hcd *hcd = bus_to_hcd(dev->bus);
-        int ret;
-        int manual = 0;
+        int i, ret, manual = 0;
         unsigned int epaddr;
         unsigned int pipe;
 
@@ -1329,6 +1328,10 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
                 mutex_unlock(hcd->bandwidth_mutex);
                 return -ENOMEM;
         }
+        /* Changing alt-setting also frees any allocated streams */
+        for (i = 0; i < iface->cur_altsetting->desc.bNumEndpoints; i++)
+                iface->cur_altsetting->endpoint[i].streams = 0;
+
         ret = usb_hcd_alloc_bandwidth(dev, NULL, iface->cur_altsetting, alt);
         if (ret < 0) {
                 dev_info(&dev->dev, "Not enough bandwidth for altsetting %d\n",