diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-24 15:35:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 15:35:18 +0100 |
| commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
| tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /drivers/usb/host/ohci-sa1111.c | |
| parent | Merge tag 'ib-asoc-1' of git://git.linaro.org/people/ljones/mfd into asoc-ari... (diff) | |
| parent | Linux 3.13-rc1 (diff) | |
| download | linux-30c27abd28fa168d7ebd2e5286f1fe473c74bfa9.tar.xz linux-30c27abd28fa168d7ebd2e5286f1fe473c74bfa9.zip | |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'drivers/usb/host/ohci-sa1111.c')
| -rw-r--r-- | drivers/usb/host/ohci-sa1111.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index 17b2a7dad77b..aa9e127bbe71 100644 --- a/drivers/usb/host/ohci-sa1111.c +++ b/drivers/usb/host/ohci-sa1111.c @@ -185,6 +185,12 @@ static int ohci_hcd_sa1111_probe(struct sa1111_dev *dev) if (usb_disabled()) return -ENODEV; + /* + * We don't call dma_set_mask_and_coherent() here because the + * DMA mask has already been appropraitely setup by the core + * SA-1111 bus code (which includes bug workarounds.) + */ + hcd = usb_create_hcd(&ohci_sa1111_hc_driver, &dev->dev, "sa1111"); if (!hcd) return -ENOMEM; |