aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/staging/octeon-usb
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2015-03-22 17:37:57 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-24 13:47:12 +0100
commit164814bb6e21dfd27952ddcbe65709ed7aa83d4a (patch)
treef70ec057679d32b94c98ff39f86b426509bbf93d /drivers/staging/octeon-usb
parentstaging: octeon-usb: move fifo setup into a separate routine (diff)
downloadwireguard-linux-164814bb6e21dfd27952ddcbe65709ed7aa83d4a.tar.xz
wireguard-linux-164814bb6e21dfd27952ddcbe65709ed7aa83d4a.zip
staging: octeon-usb: move fifo setup to controller reset from port reset
Move FIFO setup to controller reset from port reset. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon-usb')
-rw-r--r--drivers/staging/octeon-usb/octeon-hcd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c
index 4a65af5bb31a..98debd7876b9 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.c
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
@@ -918,6 +918,8 @@ static int cvmx_usb_initialize(struct cvmx_usb_state *usb)
*/
}
+ cvmx_fifo_setup(usb);
+
return 0;
}
@@ -1005,8 +1007,6 @@ static int cvmx_usb_enable(struct cvmx_usb_state *usb)
usb->usbcx_hprt.u32 = cvmx_usb_read_csr32(usb,
CVMX_USBCX_HPRT(usb->index));
- cvmx_fifo_setup(usb);
-
return 0;
}