Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)

1 files changed, 32 insertions, 0 deletions

diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c
index 24c73c5a3435..4538a98b6f9d 100644
--- a/drivers/usb/host/uhci-debug.c
+++ b/drivers/usb/host/uhci-debug.c
@@ -237,6 +237,37 @@ static int uhci_show_sc(int port, unsigned short status, char *buf, int len)
         return out - buf;
 }
 
+static int uhci_show_root_hub_state(struct uhci_hcd *uhci, char *buf, int len)
+{
+        char *out = buf;
+        char *rh_state;
+
+        /* Try to make sure there's enough memory */
+        if (len < 60)
+                return 0;
+
+        switch (uhci->rh_state) {
+            case UHCI_RH_RESET:
+                rh_state = "reset";             break;
+            case UHCI_RH_SUSPENDED:
+                rh_state = "suspended";         break;
+            case UHCI_RH_AUTO_STOPPED:
+                rh_state = "auto-stopped";      break;
+            case UHCI_RH_RESUMING:
+                rh_state = "resuming";          break;
+            case UHCI_RH_SUSPENDING:
+                rh_state = "suspending";        break;
+            case UHCI_RH_RUNNING:
+                rh_state = "running";           break;
+            case UHCI_RH_RUNNING_NODEVS:
+                rh_state = "running, no devs";  break;
+            default:
+                rh_state = "?";                 break;
+        }
+        out += sprintf(out, "Root-hub state: %s\n", rh_state);
+        return out - buf;
+}
+
 static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)
 {
         char *out = buf;
@@ -408,6 +439,7 @@ static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)
 
         spin_lock_irqsave(&uhci->lock, flags);
 
+        out += uhci_show_root_hub_state(uhci, out, len - (out - buf));
         out += sprintf(out, "HC status\n");
         out += uhci_show_status(uhci, out, len - (out - buf));