staging: ozwpan: Return correct hub status.
authorRupesh Gujare <rupesh.gujare@atmel.com>
Mon, 5 Aug 2013 17:40:15 +0000 (18:40 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Aug 2013 21:58:34 +0000 (14:58 -0700)
Fix a bug where we were not returning correct hub status
for 8th port.

Signed-off-by: Rupesh Gujare <rupesh.gujare@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ozwpan/ozhcd.c

index 26eaa74..f38d036 100644 (file)
@@ -1865,17 +1865,24 @@ static int oz_hcd_hub_status_data(struct usb_hcd *hcd, char *buf)
        int i;
 
        buf[0] = 0;
+       buf[1] = 0;
 
        spin_lock_bh(&ozhcd->hcd_lock);
        for (i = 0; i < OZ_NB_PORTS; i++) {
                if (ozhcd->ports[i].flags & OZ_PORT_F_CHANGED) {
                        oz_dbg(HUB, "Port %d changed\n", i);
                        ozhcd->ports[i].flags &= ~OZ_PORT_F_CHANGED;
-                       buf[0] |= 1<<(i+1);
+                       if (i < 7)
+                               buf[0] |= 1 << (i+1);
+                       else
+                               buf[1] |= 1 << (i-7);
                }
        }
        spin_unlock_bh(&ozhcd->hcd_lock);
-       return buf[0] ? 1 : 0;
+       if (buf[0] != 0 || buf[1] != 0)
+               return 2;
+       else
+               return 0;
 }
 /*------------------------------------------------------------------------------
  * Context: process