diff options
| author | Tom Rini <trini@ti.com> | 2013-12-18 15:06:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-18 15:06:43 -0500 |
| commit | 2d65256bb0ea105eb11e30c1beb6da121b719f06 (patch) | |
| tree | d3c16ff19eb900017d4c7df201df11f8e31f2372 /drivers/usb/host/ehci-hcd.c | |
| parent | 57270260adc6076facd284107be463f9beebb153 (diff) | |
| parent | eb63218b9b95a59baa8b241f3a88e4415dabf833 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 8bd1eb8a99..17187caed4 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -201,6 +201,9 @@ static int ehci_shutdown(struct ehci_ctrl *ctrl) int i, ret = 0; uint32_t cmd, reg; + if (!ctrl || !ctrl->hcor) + return -EINVAL; + cmd = ehci_readl(&ctrl->hcor->or_usbcmd); cmd &= ~(CMD_PSE | CMD_ASE); ehci_writel(&ctrl->hcor->or_usbcmd, cmd); @@ -945,7 +948,7 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller) #endif /* Set the high address word (aka segment) for 64-bit controller */ if (ehci_readl(&ehcic[index].hccr->cr_hccparams) & 1) - ehci_writel(ehcic[index].hcor->or_ctrldssegment, 0); + ehci_writel(&ehcic[index].hcor->or_ctrldssegment, 0); qh_list = &ehcic[index].qh_list; |