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/[email protected]/ Fixes: 8a7b31d ("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]>
1 parent 1b929c0 commit b659b61

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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)