diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-30 01:02:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-30 01:02:11 +0200 |
| commit | 0a9463e93537a68e7246714f43fb69eca0b7b214 (patch) | |
| tree | cec01ecc6502a65cbbbda406dfac23b93c093899 /drivers/usb | |
| parent | 955ea6fc2749a4305395758fc797cf8c11dcbed7 (diff) | |
| parent | bde3892edac99bf974e5b9809a112a6ce530be03 (diff) | |
| download | u-boot-imx-0a9463e93537a68e7246714f43fb69eca0b7b214.zip u-boot-imx-0a9463e93537a68e7246714f43fb69eca0b7b214.tar.gz u-boot-imx-0a9463e93537a68e7246714f43fb69eca0b7b214.tar.bz2 | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 7784d92..37d056e 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -275,7 +275,7 @@ static void *ehci_alloc(size_t sz, size_t align) return NULL; } - memset(p, sz, 0); + memset(p, 0, sz); return p; } @@ -350,7 +350,6 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, (dev->parent->devnum << 16) | (0 << 8) | (0 << 0); qh->qh_endpt2 = cpu_to_hc32(endpt); qh->qh_overlay.qt_next = cpu_to_hc32(QT_NEXT_TERMINATE); - qh->qh_overlay.qt_altnext = cpu_to_hc32(QT_NEXT_TERMINATE); td = NULL; tdp = &qh->qh_overlay.qt_next; |