aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerry Toth <[email protected]>2022-12-22 21:53:02 +0100
committerGreg Kroah-Hartman <[email protected]>2022-12-28 11:22:30 +0100
commitb659b613cea2ae39746ca8bd2b69d1985dd9d770 (patch)
tree2e8512e04177a4efc34e250bc2f21f344a87ca34
parent1b929c02afd37871d5afb9d498426f83432e71c2 (diff)
Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout"
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/[email protected]/ Fixes: 8a7b31d545d3 ("usb: ulpi: defer ulpi_register on ulpi_read_id timeout") Cc: [email protected] Reported-by: Guenter Roeck <[email protected]> Signed-off-by: Ferry Toth <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/usb/common/ulpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 60e8174686a1..d7c8461976ce 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)