* [PATCH v2 1/1] Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout"
@ 2022-12-22 20:53 Ferry Toth
2023-01-02 10:10 ` Heikki Krogerus
0 siblings, 1 reply; 2+ messages in thread
From: Ferry Toth @ 2022-12-22 20:53 UTC (permalink / raw)
To: linux-usb, linux-kernel
Cc: Heikki Krogerus, Greg Kroah-Hartman, Sean Anderson, Liu Shixin,
Ferry Toth, Andrey Smirnov, Andy Shevchenko, Ferry Toth,
Guenter Roeck, stable
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@roeck-us.net>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/lkml/20221220194334.GA942039@roeck-us.net/
Signed-off-by: Ferry Toth <ftoth@exalondelft.nl>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2 1/1] Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout"
2022-12-22 20:53 [PATCH v2 1/1] Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" Ferry Toth
@ 2023-01-02 10:10 ` Heikki Krogerus
0 siblings, 0 replies; 2+ messages in thread
From: Heikki Krogerus @ 2023-01-02 10:10 UTC (permalink / raw)
To: Ferry Toth
Cc: linux-usb, linux-kernel, Greg Kroah-Hartman, Sean Anderson,
Liu Shixin, Ferry Toth, Andrey Smirnov, Andy Shevchenko,
Guenter Roeck, stable
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@roeck-us.net>
> Cc: stable@vger.kernel.org
> Link: https://lore.kernel.org/lkml/20221220194334.GA942039@roeck-us.net/
> Signed-off-by: Ferry Toth <ftoth@exalondelft.nl>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-02 10:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-22 20:53 [PATCH v2 1/1] Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" Ferry Toth
2023-01-02 10:10 ` Heikki Krogerus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®