|
Takashi Iwai |
72279f |
From 3cd54a618834430a26a648d880dd83d740f2ae30 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
72279f |
From: Ran Wang <ran.wang_1@nxp.com>
|
|
Takashi Iwai |
72279f |
Date: Sat, 10 Oct 2020 14:03:08 +0800
|
|
Takashi Iwai |
72279f |
Subject: [PATCH] usb: host: fsl-mph-dr-of: check return of dma_set_mask()
|
|
Takashi Iwai |
72279f |
Git-commit: 3cd54a618834430a26a648d880dd83d740f2ae30
|
|
Takashi Iwai |
72279f |
Patch-mainline: v5.10-rc2
|
|
Takashi Iwai |
72279f |
References: git-fixes
|
|
Takashi Iwai |
72279f |
|
|
Takashi Iwai |
72279f |
fsl_usb2_device_register() should stop init if dma_set_mask() return
|
|
Takashi Iwai |
72279f |
error.
|
|
Takashi Iwai |
72279f |
|
|
Takashi Iwai |
72279f |
Fixes: cae058610465 ("drivers/usb/host: fsl: Set DMA_MASK of usb platform device")
|
|
Takashi Iwai |
72279f |
Reviewed-by: Peter Chen <peter.chen@nxp.com>
|
|
Takashi Iwai |
72279f |
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
|
|
Takashi Iwai |
72279f |
Link: https://lore.kernel.org/r/20201010060308.33693-1-ran.wang_1@nxp.com
|
|
Takashi Iwai |
72279f |
Cc: stable <stable@vger.kernel.org>
|
|
Takashi Iwai |
72279f |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Takashi Iwai |
72279f |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
72279f |
|
|
Takashi Iwai |
72279f |
---
|
|
Takashi Iwai |
72279f |
drivers/usb/host/fsl-mph-dr-of.c | 9 ++++++---
|
|
Takashi Iwai |
72279f |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
Takashi Iwai |
72279f |
|
|
Takashi Iwai |
72279f |
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
|
|
Takashi Iwai |
72279f |
index ae8f60f6e6a5..44a7e58a26e3 100644
|
|
Takashi Iwai |
72279f |
--- a/drivers/usb/host/fsl-mph-dr-of.c
|
|
Takashi Iwai |
72279f |
+++ b/drivers/usb/host/fsl-mph-dr-of.c
|
|
Takashi Iwai |
72279f |
@@ -94,10 +94,13 @@ static struct platform_device *fsl_usb2_device_register(
|
|
Takashi Iwai |
72279f |
|
|
Takashi Iwai |
72279f |
pdev->dev.coherent_dma_mask = ofdev->dev.coherent_dma_mask;
|
|
Takashi Iwai |
72279f |
|
|
Takashi Iwai |
72279f |
- if (!pdev->dev.dma_mask)
|
|
Takashi Iwai |
72279f |
+ if (!pdev->dev.dma_mask) {
|
|
Takashi Iwai |
72279f |
pdev->dev.dma_mask = &ofdev->dev.coherent_dma_mask;
|
|
Takashi Iwai |
72279f |
- else
|
|
Takashi Iwai |
72279f |
- dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
|
|
Takashi Iwai |
72279f |
+ } else {
|
|
Takashi Iwai |
72279f |
+ retval = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
|
|
Takashi Iwai |
72279f |
+ if (retval)
|
|
Takashi Iwai |
72279f |
+ goto error;
|
|
Takashi Iwai |
72279f |
+ }
|
|
Takashi Iwai |
72279f |
|
|
Takashi Iwai |
72279f |
retval = platform_device_add_data(pdev, pdata, sizeof(*pdata));
|
|
Takashi Iwai |
72279f |
if (retval)
|
|
Takashi Iwai |
72279f |
--
|
|
Takashi Iwai |
72279f |
2.16.4
|
|
Takashi Iwai |
72279f |
|