diff options
| author | Jon Loeliger <jdl@freescale.com> | 2005-08-02 13:53:07 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2005-08-02 13:53:07 -0500 |
| commit | 4b1d95d96a39a71eddd088bb5e0e9e699035c9bf (patch) | |
| tree | 57e2d52b0636c7299992e869fa0b0ee4da7ca4d2 /common/usb.c | |
| parent | de1d0a69956a63cea6a62043ae5d5afb584efe93 (diff) | |
| parent | 095b8a3798f1c6cd618092899e783dc2ee0d23f5 (diff) | |
Merge with rsync://git-user@source.denx.net/git/u-boot.git
Diffstat (limited to 'common/usb.c')
| -rw-r--r-- | common/usb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/usb.c b/common/usb.c index 811ed24e48c..03eccf8b3dd 100644 --- a/common/usb.c +++ b/common/usb.c @@ -46,7 +46,6 @@ #include <405gp_pci.h> #endif - #undef USB_DEBUG #ifdef USB_DEBUG @@ -523,6 +522,7 @@ int usb_get_string(struct usb_device *dev, unsigned short langid, unsigned char if (result > 0) break; } + return result; } @@ -723,6 +723,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 +957,7 @@ static int hub_port_reset(struct usb_device *dev, int port, return -1; if (portstatus & USB_PORT_STAT_ENABLE) { + break; } |