summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-02-06 22:39:50 +0100
committerWolfgang Denk <wd@denx.de>2011-02-06 22:39:50 +0100
commit367c6651a88dda0463f9fbeff3b1ab7ece05b4f9 (patch)
tree71adf7097af32f8734c77654bf5a4b7bbafe29b2
parente9e481f74b4ebb75858a535a79dbb1cde6aff0b6 (diff)
parentce297a8f7e6134b2dcbf4d180b1183a884f73c30 (diff)
downloadu-boot-imx-367c6651a88dda0463f9fbeff3b1ab7ece05b4f9.zip
u-boot-imx-367c6651a88dda0463f9fbeff3b1ab7ece05b4f9.tar.gz
u-boot-imx-367c6651a88dda0463f9fbeff3b1ab7ece05b4f9.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-usb
-rw-r--r--common/usb.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/common/usb.c b/common/usb.c
index 10e23de..44a435a 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -55,7 +55,10 @@
#include <asm/4xx_pci.h>
#endif
-#undef USB_DEBUG
+#ifdef DEBUG
+#define USB_DEBUG
+#define USB_HUB_DEBUG
+#endif
#ifdef USB_DEBUG
#define USB_PRINTF(fmt, args...) printf(fmt , ##args)
@@ -960,8 +963,6 @@ void usb_scan_devices(void)
* Probes device for being a hub and configurate it
*/
-#undef USB_HUB_DEBUG
-
#ifdef USB_HUB_DEBUG
#define USB_HUB_PRINTF(fmt, args...) printf(fmt , ##args)
#else
@@ -1220,7 +1221,7 @@ int usb_hub_configure(struct usb_device *dev)
hub->desc.DeviceRemovable[i] = descriptor->DeviceRemovable[i];
for (i = 0; i < ((hub->desc.bNbrPorts + 1 + 7)/8); i++)
- hub->desc.DeviceRemovable[i] = descriptor->PortPowerCtrlMask[i];
+ hub->desc.PortPowerCtrlMask[i] = descriptor->PortPowerCtrlMask[i];
dev->maxchild = descriptor->bNbrPorts;
USB_HUB_PRINTF("%d ports detected\n", dev->maxchild);