Auto merge with /home/aegl/GIT/linus

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index e2fc4129dfc6..83ca4549a50e 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -419,10 +419,11 @@ ohci_hub_descriptor (
 
         /* two bitmaps:  ports removable, and usb 1.0 legacy PortPwrCtrlMask */
         rh = roothub_b (ohci);
+        memset(desc->bitmap, 0xff, sizeof(desc->bitmap));
         desc->bitmap [0] = rh & RH_B_DR;
         if (ports > 7) {
                 desc->bitmap [1] = (rh & RH_B_DR) >> 8;
-                desc->bitmap [2] = desc->bitmap [3] = 0xff;
+                desc->bitmap [2] = 0xff;
         } else
                 desc->bitmap [1] = 0xff;
 }