This is a note to let you know that I've just added the patch titled Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From b659b613cea2ae39746ca8bd2b69d1985dd9d770 Mon Sep 17 00:00:00 2001 From: Ferry Toth <ftoth@xxxxxxxxxxxxxx> Date: Thu, 22 Dec 2022 21:53:02 +0100 Subject: Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" From: Ferry Toth <ftoth@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxx/ Fixes: 8a7b31d545d3 ("usb: ulpi: defer ulpi_register on ulpi_read_id timeout") Cc: stable@xxxxxxxxxxxxxxx Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx> Signed-off-by: Ferry Toth <ftoth@xxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20221222205302.45761-1-ftoth@xxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/usb/common/ulpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -214,7 +214,7 @@ static int ulpi_read_id(struct ulpi *ulp ret = ulpi_read(ulpi, ULPI_SCRATCH); if (ret < 0) - return ret; + goto err; if (ret != 0xaa) goto err; Patches currently in stable-queue which might be from ftoth@xxxxxxxxxxxxxx are queue-4.14/usb-dwc3-core-defer-probe-on-ulpi_read_id-timeout.patch queue-4.14/revert-usb-ulpi-defer-ulpi_register-on-ulpi_read_id-timeout.patch