From: Luca Lauro <[email protected]> Store the DMA address of the periodic queue head in ehci->periodic_queue_dma. Without this initialization the periodic schedule may reference an invalid address.
Signed-off-by: Luca Lauro <[email protected]> --- drivers/usb/host/ehci-hcd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 51b9e52a4f..a4832bb3ff 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -897,6 +897,8 @@ static int ehci_init(struct usb_host *host) periodic->qt_next = cpu_to_hc32(QT_NEXT_TERMINATE); periodic->qt_altnext = cpu_to_hc32(QT_NEXT_TERMINATE); + ehci->periodic_queue_dma = ehci_qh_dma(ehci, periodic); + /* * Step 2: Setup frame-list: Every microframe, USB tries the same list. * In particular, device specifications on polling frequency @@ -1442,11 +1444,14 @@ static int ehci_probe(struct device *dev) if (ret) return ret; - ret = clk_bulk_get_all_enabled(dev, &clks); + ret = clk_bulk_get_all(dev, &clks); if (ret < 0) return ret; num_clocks = ret; + ret = clk_bulk_enable(num_clocks, clks); + if (ret) + return ret; iores = dev_request_mem_resource(dev, 0); if (IS_ERR(iores)) -- 2.47.3
