diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-27 14:48:52 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-27 14:48:52 -0500 |
| commit | f95a4b3a5518818c831f1136053f9b2366018d0b (patch) | |
| tree | 121920928d0e8d6a9de0bd7303cc649634acb9c1 | |
| parent | d61639e39a9f1a5c0a05b384196c60a4f75ec93a (diff) | |
| parent | 6f7c92db4c7d1e45503fb10e60caa1ec2bb18d10 (diff) | |
Merge git://git.denx.de/u-boot-usb
| -rw-r--r-- | drivers/usb/host/ehci-mxs.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c index 6b8d969bb0..9872415562 100644 --- a/drivers/usb/host/ehci-mxs.c +++ b/drivers/usb/host/ehci-mxs.c @@ -156,7 +156,7 @@ int ehci_hcd_stop(int index) tmp = ehci_readl(&hcor->or_usbcmd); tmp &= ~CMD_RUN; - ehci_writel(tmp, &hcor->or_usbcmd); + ehci_writel(&hcor->or_usbcmd, tmp); /* Disable the PHY */ tmp = USBPHY_PWD_RXPWDRX | USBPHY_PWD_RXPWDDIFF | diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 579e6707eb..7599c9183a 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -557,7 +557,7 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe, { int num_trbs = 0; struct xhci_generic_trb *start_trb; - bool first_trb = 0; + bool first_trb = false; int start_cycle; u32 field = 0; u32 length_field = 0; |