diff options
| author | Wolfgang Denk <[email protected]> | 2010-06-29 23:03:47 +0200 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2010-06-29 23:03:47 +0200 |
| commit | a8e2b04417b802a9baf86de9c2e06375135e666f (patch) | |
| tree | 32b86ea6c84ae6a26294459c61977bca191c5b93 /drivers | |
| parent | 1f9d10f694f6f901a826a5b42fbfe914e2117971 (diff) | |
| parent | 161e4ae46046282fde6a69a0f1f80965f2a1b6f4 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/work
Diffstat (limited to 'drivers')
| -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 7784d92b6f6..37d056e0057 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; |