From: Peter Chen <peter.chen@nxp.com>
To: Ran Wang <ran.wang_1@nxp.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jun Li <jun.li@nxp.com>,
"open list:USB SUBSYSTEM" <linux-usb@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] usb: host: fsl-mph-dr-of: check return of dma_set_mask()
Date: Sat, 10 Oct 2020 23:40:55 +0000 [thread overview]
Message-ID: <20201010234028.GA16433@b29397-desktop> (raw)
In-Reply-To: <20201010060308.33693-1-ran.wang_1@nxp.com>
On 20-10-10 14:03:08, Ran Wang wrote:
> fsl_usb2_device_register() should stop init if dma_set_mask() return
> error.
>
> Fixes: cae058610465 ("drivers/usb/host: fsl: Set DMA_MASK of usb platform device")
> Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
> ---
> drivers/usb/host/fsl-mph-dr-of.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
> index ae8f60f..44a7e58 100644
> --- a/drivers/usb/host/fsl-mph-dr-of.c
> +++ b/drivers/usb/host/fsl-mph-dr-of.c
> @@ -94,10 +94,13 @@ static struct platform_device *fsl_usb2_device_register(
>
> pdev->dev.coherent_dma_mask = ofdev->dev.coherent_dma_mask;
>
> - if (!pdev->dev.dma_mask)
> + if (!pdev->dev.dma_mask) {
> pdev->dev.dma_mask = &ofdev->dev.coherent_dma_mask;
> - else
> - dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> + } else {
> + retval = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> + if (retval)
> + goto error;
> + }
>
> retval = platform_device_add_data(pdev, pdata, sizeof(*pdata));
> if (retval)
> --
> 2.7.4
>
Reviewed-by: Peter Chen <peter.chen@nxp.com>
One more place need to fix, if platform_device_alloc returns NULL,
it should not call platform_device_put to release platform
device memory.
pdev = platform_device_alloc(name, id);
if (!pdev) {
retval = -ENOMEM;
goto error;
}
...
error:
platform_device_put(pdev);
return ERR_PTR(retval);
--
Thanks,
Peter Chen
next prev parent reply other threads:[~2020-10-10 23:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-10 6:03 [PATCH] usb: host: fsl-mph-dr-of: check return of dma_set_mask() Ran Wang
2020-10-10 23:40 ` Peter Chen [this message]
2020-10-14 7:49 ` Ran Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201010234028.GA16433@b29397-desktop \
--to=peter.chen@nxp.com \
--cc=gregkh@linuxfoundation.org \
--cc=jun.li@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=ran.wang_1@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).