diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-25 11:20:49 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-25 11:20:49 +0300 |
| commit | 692665c621bb73f298d37bf6c6dad47ef94a5c2b (patch) | |
| tree | e8a304fb67125cbae6403434edc424b77efcaf97 /drivers/usb/host | |
| parent | afa197e3cb240fdd6194dd4c8545cdd45c82770e (diff) | |
| parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
| download | linux-692665c621bb73f298d37bf6c6dad47ef94a5c2b.tar.xz | |
Merge 4.10-rc5 into usb-next
We need the USB fixes in here as well to handle future merge issues and
dependancies.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/xhci-plat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index f96caeb4baab..c0cd98e804a3 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -165,7 +165,7 @@ static int xhci_plat_probe(struct platform_device *pdev) return -ENODEV; /* Try to set 64-bit DMA first */ - if (WARN_ON(!pdev->dev.dma_mask)) + if (!pdev->dev.dma_mask) /* Platform did not initialize dma_mask */ ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); |