1 files changed, 13 insertions, 9 deletions

diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index ea398e5d50af..a47c30b2d764 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -104,7 +104,7 @@ static const char *format_config =
   
 static const char *format_iface =
 /* I:  If#=dd Alt=dd #EPs=dd Cls=xx(sssss) Sub=xx Prot=xx Driver=xxxx*/
-  "I:  If#=%2d Alt=%2d #EPs=%2d Cls=%02x(%-5s) Sub=%02x Prot=%02x Driver=%s\n";
+  "I:%c If#=%2d Alt=%2d #EPs=%2d Cls=%02x(%-5s) Sub=%02x Prot=%02x Driver=%s\n";
 
 static const char *format_endpt =
 /* E:  Ad=xx(s) Atr=xx(ssss) MxPS=dddd Ivl=D?s */
@@ -164,10 +164,10 @@ static const char *class_decode(const int class)
         for (ix = 0; clas_info[ix].class != -1; ix++)
                 if (clas_info[ix].class == class)
                         break;
-        return (clas_info[ix].class_name);
+        return clas_info[ix].class_name;
 }
 
-static char *usb_dump_endpoint_descriptor (
+static char *usb_dump_endpoint_descriptor(
         int speed,
         char *start,
         char *end,
@@ -212,9 +212,9 @@ static char *usb_dump_endpoint_descriptor (
                 break;
         case USB_ENDPOINT_XFER_INT:
                 type = "Int.";
-                if (speed == USB_SPEED_HIGH) {
+                if (speed == USB_SPEED_HIGH)
                         interval = 1 << (desc->bInterval - 1);
-                } else
+                else
                         interval = desc->bInterval;
                 break;
         default:        /* "can't happen" */
@@ -242,15 +242,19 @@ static char *usb_dump_interface_descriptor(char *start, char *end,
 {
         const struct usb_interface_descriptor *desc = &intfc->altsetting[setno].desc;
         const char *driver_name = "";
+        int active = 0;
 
         if (start > end)
                 return start;
         down_read(&usb_bus_type.subsys.rwsem);
-        if (iface)
+        if (iface) {
                 driver_name = (iface->dev.driver
                                 ? iface->dev.driver->name
                                 : "(none)");
+                active = (desc == &iface->cur_altsetting->desc);
+        }
         start += sprintf(start, format_iface,
+                         active ? '*' : ' ',    /* mark active altsetting */
                          desc->bInterfaceNumber,
                          desc->bAlternateSetting,
                          desc->bNumEndpoints,
@@ -343,7 +347,7 @@ static char *usb_dump_device_descriptor(char *start, char *end, const struct usb
 
         if (start > end)
                 return start;
-        start += sprintf (start, format_device1,
+        start += sprintf(start, format_device1,
                           bcdUSB >> 8, bcdUSB & 0xff,
                           desc->bDeviceClass,
                           class_decode (desc->bDeviceClass),
@@ -363,7 +367,7 @@ static char *usb_dump_device_descriptor(char *start, char *end, const struct usb
 /*
  * Dump the different strings that this device holds.
  */
-static char *usb_dump_device_strings (char *start, char *end, struct usb_device *dev)
+static char *usb_dump_device_strings(char *start, char *end, struct usb_device *dev)
 {
         if (start > end)
                 return start;
@@ -395,7 +399,7 @@ static char *usb_dump_desc(char *start, char *end, struct usb_device *dev)
         if (start > end)
                 return start;
         
-        start = usb_dump_device_strings (start, end, dev);
+        start = usb_dump_device_strings(start, end, dev);
 
         for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
                 if (start > end)