On Thu, Dec 22, 2022 at 09:53:02PM +0100, Ferry Toth wrote:
> 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.
>
> Fixes: 8a7b31d545d3 ("usb: ulpi: defer ulpi_register on ulpi_read_id timeout")
> Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
> Link: https://lore.kernel.org/lkml/20221220194334.GA942039@xxxxxxxxxxxx/
> Signed-off-by: Ferry Toth <ftoth@xxxxxxxxxxxxxx>
Acked-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/common/ulpi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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)
> --
> 2.37.2
--
heikki
