| From 4d561a900c3907ea5bcc9bf8fbce27fd1c2fe5be Mon Sep 17 00:00:00 2001 |
| From: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Date: Fri, 20 Jan 2017 15:38:24 +0200 |
| Subject: [PATCH 296/299] xhci: remove WARN_ON if dma mask is not set for |
| platform devices |
| |
| The warn on is a bit too much, we will anyway set the dma mask if not set |
| previously. |
| |
| The main reason for this fix is that 4.10-rc1 has a dwc3 change that |
| pass a parent sysdev dev pointer instead of setting the dma mask of |
| its xhci platform device. xhci platform driver can then get more |
| attributes from the sysdev than just the dma mask. |
| |
| The usb core and xhci changes are not yet in 4.10, and a fix like |
| this was preferred instead of taking those big changes this late in |
| the rc-cycle. |
| |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 488dc164914ff5ce5e913abd32048d28fc0d06b8) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-plat.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/usb/host/xhci-plat.c |
| +++ b/drivers/usb/host/xhci-plat.c |
| @@ -165,7 +165,7 @@ static int xhci_plat_probe(struct platfo |
| return irq; |
| |
| /* 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)); |
