Commit 5a569343 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

usb/max3421: fix return error code in max3421_probe() 



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: 721fdc83 ("usb: max3421: Add devicetree support")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20201117061500.3454223-1-yangyingliang@huawei.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 523a97aa

drivers/usb/host/max3421-hcd.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {