lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 214/563] usb: dwc3: qcom: Fix NULL vs IS_ERR checking in dwc3_qcom_probe
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit b52fe2dbb3e655eb1483000adfab68a219549e13 ]

    Since the acpi_create_platform_device() function may return error
    pointers, dwc3_qcom_create_urs_usb_platdev() function may return error
    pointers too. Using IS_ERR_OR_NULL() to check the return value to fix this.

    Fixes: c25c210f590e ("usb: dwc3: qcom: add URS Host support for sdm845 ACPI boot")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Link: https://lore.kernel.org/r/20211222111823.22887-1-linmq006@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/dwc3/dwc3-qcom.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
    index 2a29e2f681fe6..504f8af4d0f80 100644
    --- a/drivers/usb/dwc3/dwc3-qcom.c
    +++ b/drivers/usb/dwc3/dwc3-qcom.c
    @@ -764,9 +764,12 @@ static int dwc3_qcom_probe(struct platform_device *pdev)

    if (qcom->acpi_pdata->is_urs) {
    qcom->urs_usb = dwc3_qcom_create_urs_usb_platdev(dev);
    - if (!qcom->urs_usb) {
    + if (IS_ERR_OR_NULL(qcom->urs_usb)) {
    dev_err(dev, "failed to create URS USB platdev\n");
    - return -ENODEV;
    + if (!qcom->urs_usb)
    + return -ENODEV;
    + else
    + return PTR_ERR(qcom->urs_usb);
    }
    }
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:40    [W:5.483 / U:0.820 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site