diff options
author | Stefan Roese <sr@denx.de> | 2008-07-17 10:41:06 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-07-17 10:41:06 +0200 |
commit | 42246dacf60d5028d3a48a220ce94efcf56faec4 (patch) | |
tree | 52613a7ee19d68700426c8e7d7504346daa0f7f3 /common/usb.c | |
parent | 11188d55bc16dd907451c00282e00a038f73dd62 (diff) | |
parent | 699f05125509249072a0b865c8d35520d97cd501 (diff) | |
download | u-boot-imx-42246dacf60d5028d3a48a220ce94efcf56faec4.zip u-boot-imx-42246dacf60d5028d3a48a220ce94efcf56faec4.tar.gz u-boot-imx-42246dacf60d5028d3a48a220ce94efcf56faec4.tar.bz2 |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'common/usb.c')
-rw-r--r-- | common/usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/usb.c b/common/usb.c index a0107dc..a45d113 100644 --- a/common/usb.c +++ b/common/usb.c @@ -252,7 +252,7 @@ int usb_set_maxpacket(struct usb_device *dev) for(i=0; i<dev->config.bNumInterfaces;i++) { for(ii=0; ii<dev->config.if_desc[i].bNumEndpoints; ii++) { - ep=&dev->config.if_desc[i].ep_desc[ii]; + ep = &dev->config.if_desc[i].ep_desc[ii]; b=ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK; if((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)==USB_ENDPOINT_XFER_CONTROL) { /* Control => bidirectional */ @@ -627,7 +627,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size) if (size <= 0 || !buf || !index) return -1; buf[0] = 0; - tbuf=&mybuf[0]; + tbuf = &mybuf[0]; /* get langid for strings if it's not yet known */ if (!dev->have_langid) { @@ -857,7 +857,7 @@ void usb_scan_devices(void) /* first make all devices unknown */ for(i=0;i<USB_MAX_DEVICE;i++) { memset(&usb_dev[i],0,sizeof(struct usb_device)); - usb_dev[i].devnum=-1; + usb_dev[i].devnum = -1; } dev_index=0; /* device 0 is always present (root hub, so let it analyze) */ |