diff options
| author | Wolfgang Denk <wd@pollux.(none)> | 2005-08-02 17:06:17 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.(none)> | 2005-08-02 17:06:17 +0200 |
| commit | 095b8a3798f1c6cd618092899e783dc2ee0d23f5 (patch) | |
| tree | 397887e662586728029560b27873451b4547c430 /common/usb.c | |
| parent | 797638f9ff2dc8e57f7bf57bfaa83d60e0784ea0 (diff) | |
| download | u-boot-imx-095b8a3798f1c6cd618092899e783dc2ee0d23f5.zip u-boot-imx-095b8a3798f1c6cd618092899e783dc2ee0d23f5.tar.gz u-boot-imx-095b8a3798f1c6cd618092899e783dc2ee0d23f5.tar.bz2 | |
Coding style cleanup
Diffstat (limited to 'common/usb.c')
| -rw-r--r-- | common/usb.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/common/usb.c b/common/usb.c index 1738d95..03eccf8 100644 --- a/common/usb.c +++ b/common/usb.c @@ -46,8 +46,7 @@ #include <405gp_pci.h> #endif - -#undef USB_DEBUG +#undef USB_DEBUG #ifdef USB_DEBUG #define USB_PRINTF(fmt,args...) printf (fmt ,##args) @@ -342,7 +341,7 @@ int usb_clear_halt(struct usb_device *dev, int pipe) if (result < 0) return result; - /* + /* * NOTE: we do not get status and verify reset was successful * as some devices are reported to lock up upon this check.. */ @@ -517,13 +516,13 @@ int usb_get_string(struct usb_device *dev, unsigned short langid, unsigned char /* some devices are flaky */ result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), USB_REQ_GET_DESCRIPTOR, USB_DIR_IN, - (USB_DT_STRING << 8) + index, langid, buf, size, + (USB_DT_STRING << 8) + index, langid, buf, size, USB_CNTL_TIMEOUT); if (result > 0) break; - } - + } + return result; } @@ -572,7 +571,7 @@ static int usb_string_sub(struct usb_device *dev, unsigned int langid, } if (rc < 2) - rc = -1; + rc = -1; return rc; } @@ -721,10 +720,10 @@ int usb_new_device(struct usb_device *dev) } } dev->descriptor.bMaxPacketSize0 = desc->bMaxPacketSize0; - + /* find the port number we're at */ if (parent) { - + for (j = 0; j < parent->maxchild; j++) { if (parent->children[j] == dev) { port = j; @@ -958,7 +957,7 @@ static int hub_port_reset(struct usb_device *dev, int port, return -1; if (portstatus & USB_PORT_STAT_ENABLE) { - + break; } |