Fix the machine-id of the Cogent csb637 board

[platform/kernel/u-boot.git] / common / usb.c

diff --git a/common/usb.c b/common/usb.c
index 811ed24..d9515e6 100644 (file)
--- a/common/usb.c
+++ b/common/usb.c
@@ -1,9 +1,19 @@
 /*
- * (C) Copyright 2001
- * Denis Peter, MPL AG Switzerland
  *
  * Most of this source has been derived from the Linux USB
- * project.
+ * project:
+ * (C) Copyright Linus Torvalds 1999
+ * (C) Copyright Johannes Erdfelt 1999-2001
+ * (C) Copyright Andreas Gal 1999
+ * (C) Copyright Gregory P. Smith 1999
+ * (C) Copyright Deti Fliegl 1999 (new USB architecture)
+ * (C) Copyright Randy Dunlap 2000
+ * (C) Copyright David Brownell 2000 (kernel hotplug, usb_device_id)
+ * (C) Copyright Yggdrasil Computing, Inc. 2000
+ *     (usb_device_id matching changes by Adam J. Richter)
+ *
+ * Adapted for U-Boot:
+ * (C) Copyright 2001 Denis Peter, MPL AG Switzerland
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -46,7 +56,6 @@
 #include <405gp_pci.h>
 #endif
 
-
 #undef USB_DEBUG
 
 #ifdef USB_DEBUG
@@ -523,6 +532,7 @@ int usb_get_string(struct usb_device *dev, unsigned short langid, unsigned char
                if (result > 0)
                        break;
        }
+
        return result;
 }
 
@@ -723,6 +733,7 @@ int usb_new_device(struct usb_device *dev)
 
        /* find the port number we're at */
        if (parent) {
+
                for (j = 0; j < parent->maxchild; j++) {
                        if (parent->children[j] == dev) {
                                port = j;
@@ -956,6 +967,7 @@ static int hub_port_reset(struct usb_device *dev, int port,
                        return -1;
 
                if (portstatus & USB_PORT_STAT_ENABLE) {
+
                        break;
                }