Skip to content

Commit b659b61

Browse files
htotgregkh
authored andcommitted
Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout"
This reverts commit 8a7b31d. 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: 8a7b31d ("usb: ulpi: defer ulpi_register on ulpi_read_id timeout") Cc: stable@vger.kernel.org Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Ferry Toth <ftoth@exalondelft.nl> Link: https://lore.kernel.org/r/20221222205302.45761-1-ftoth@exalondelft.nl Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1b929c0 commit b659b61

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/usb/common/ulpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static int ulpi_read_id(struct ulpi *ulpi)
207207
/* Test the interface */
208208
ret = ulpi_write(ulpi, ULPI_SCRATCH, 0xaa);
209209
if (ret < 0)
210-
return ret;
210+
goto err;
211211

212212
ret = ulpi_read(ulpi, ULPI_SCRATCH);
213213
if (ret < 0)

0 commit comments

Comments
 (0)