]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout"
authorFerry Toth <ftoth@exalondelft.nl>
Thu, 22 Dec 2022 20:53:02 +0000 (21:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jan 2023 08:26:44 +0000 (09:26 +0100)
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@roeck-us.net/
Fixes: 8a7b31d545d3 ("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>
drivers/usb/common/ulpi.c

index 21b0128133763d60973ca6106eb0e6bffcc3cddf..2ca2e4ee1c5611fc4a2bb819f9974ba529b44319 100644 (file)
@@ -214,7 +214,7 @@ static int ulpi_read_id(struct ulpi *ulpi)
 
        ret = ulpi_read(ulpi, ULPI_SCRATCH);
        if (ret < 0)
-               return ret;
+               goto err;
 
        if (ret != 0xaa)
                goto err;