From: Ferry Toth Date: Thu, 22 Dec 2022 20:53:02 +0000 (+0100) Subject: Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" X-Git-Tag: baikal/aarch64/sdk5.9~194 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=ee3ccad1f9993ca6cd287a5bc7dda95e19c9a619;p=kernel.git Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" commit b659b613cea2ae39746ca8bd2b69d1985dd9d770 upstream. This reverts commit 8a7b31d545d3a15f0e6f5984ae16f0ca4fd76aac. This patch results in some qemu test failures, specifically xilinx-zynq-a9 machine and zynq-zc702 as well as zynq-zed devicetree files, when trying to boot from USB drive. Link: https://lore.kernel.org/lkml/20221220194334.GA942039@roeck-us.net/ Fixes: 8a7b31d545d3 ("usb: ulpi: defer ulpi_register on ulpi_read_id timeout") Cc: stable@vger.kernel.org Reported-by: Guenter Roeck Signed-off-by: Ferry Toth Link: https://lore.kernel.org/r/20221222205302.45761-1-ftoth@exalondelft.nl Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index 94700c1d2f6e8..c42c152bbc335 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -207,7 +207,7 @@ static int ulpi_read_id(struct ulpi *ulpi) /* Test the interface */ ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa); if (ret < 0) - return ret; + goto err; ret = ulpi_read(ulpi, ULPI_SCRATCH); if (ret < 0)