projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ec9a45
)
Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout"
author
Ferry Toth
<ftoth@exalondelft.nl>
Thu, 22 Dec 2022 20:53:02 +0000
(21:53 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 18 Jan 2023 10:48:58 +0000
(11:48 +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
patch
|
blob
|
history
diff --git
a/drivers/usb/common/ulpi.c
b/drivers/usb/common/ulpi.c
index
0e46293
..
5509d38
100644
(file)
--- a/
drivers/usb/common/ulpi.c
+++ b/
drivers/usb/common/ulpi.c
@@
-206,7
+206,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)