diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-04 20:25:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-04 20:25:58 +0300 |
| commit | 792f7525ac8b9f13df8a4849b25fa4d4a2ac3400 (patch) | |
| tree | 7ea7f50a47dbffad0f6ee33ceb586c10265008e2 /drivers/usb/chipidea/ci_hdrc_imx.c | |
| parent | e6c037bfcafad1b401a6c02ba05a3f1b87925860 (diff) | |
| parent | 764763f0a0c81cbed4d2c7dc2b05e7173ff85b5b (diff) | |
| download | linux-792f7525ac8b9f13df8a4849b25fa4d4a2ac3400.tar.xz | |
Merge tag 'usb-ci-v4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next
Hi Greg, below are changes for chipidea and OTG FSM, no major changes.
Some for documentation, some for tiny changes, thanks.
Diffstat (limited to 'drivers/usb/chipidea/ci_hdrc_imx.c')
| -rw-r--r-- | drivers/usb/chipidea/ci_hdrc_imx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c index 9ce8c9f91674..dedc33e589f4 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.c +++ b/drivers/usb/chipidea/ci_hdrc_imx.c @@ -292,10 +292,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) if (pdata.flags & CI_HDRC_SUPPORTS_RUNTIME_PM) data->supports_runtime_pm = true; - ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); - if (ret) - goto err_clk; - ret = imx_usbmisc_init(data->usbmisc_data); if (ret) { dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n", ret); |