lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 152/717] usb/max3421: fix return error code in max3421_probe()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit 5a569343e8a618dc73edebe0957eb42f2ab476bd ]

    retval may be reassigned to 0 after max3421_of_vbus_en_pin(),
    if allocate memory failed after this, max3421_probe() cann't
    return ENOMEM, fix this by moving assign retval afther max3421_probe().

    Fixes: 721fdc83b31b ("usb: max3421: Add devicetree support")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Link: https://lore.kernel.org/r/20201117061500.3454223-1-yangyingliang@huawei.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/host/max3421-hcd.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c
    index 0894f6caccb2c..ebb8180b52ab1 100644
    --- a/drivers/usb/host/max3421-hcd.c
    +++ b/drivers/usb/host/max3421-hcd.c
    @@ -1847,7 +1847,7 @@ max3421_probe(struct spi_device *spi)
    struct max3421_hcd *max3421_hcd;
    struct usb_hcd *hcd = NULL;
    struct max3421_hcd_platform_data *pdata = NULL;
    - int retval = -ENOMEM;
    + int retval;

    if (spi_setup(spi) < 0) {
    dev_err(&spi->dev, "Unable to setup SPI bus");
    @@ -1889,6 +1889,7 @@ max3421_probe(struct spi_device *spi)
    goto error;
    }

    + retval = -ENOMEM;
    hcd = usb_create_hcd(&max3421_hcd_desc, &spi->dev,
    dev_name(&spi->dev));
    if (!hcd) {
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:13    [W:3.304 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site