| Message ID | 20220702004510.10147-1-andre.przywara@arm.com |
|---|---|
| State | Accepted |
| Commit | 9125b4b021d81b72d946a08775d62355a59f6fab |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | usb: host: ehci-generic: Fix error check | expand |
On 7/2/22 02:45, Andre Przywara wrote: > Commit 81755b8c20fe ("usb: host: ehci-generic: Make resets and clocks > optional") improved the error check to cover the reset property being > optional. However this was using the wrong error variable for the > check, so would now never fail. > > Use the correct error variable for checking the result of > reset_get_bulk(), to actually report genuine errors. > > Fixes: 81755b8c20fe ("usb: host: ehci-generic: Make resets and clocks optional") > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > Hi, > > apologies for messing up this simple patch of mine last month. I got > confused by the mixed usage of "ret" and "err" in this function. This > might endorse some cleanup, but I don't dare to touch this file again, > especially not that late in the cycle. Tom, can you pick this patch directly ? Andre, can you send the ret/err cleanup patch as a follow up , so it can be picked after release ?
On Sat, Jul 02, 2022 at 11:42:17PM +0200, Marek Vasut wrote: > On 7/2/22 02:45, Andre Przywara wrote: > > Commit 81755b8c20fe ("usb: host: ehci-generic: Make resets and clocks > > optional") improved the error check to cover the reset property being > > optional. However this was using the wrong error variable for the > > check, so would now never fail. > > > > Use the correct error variable for checking the result of > > reset_get_bulk(), to actually report genuine errors. > > > > Fixes: 81755b8c20fe ("usb: host: ehci-generic: Make resets and clocks optional") > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > > --- > > Hi, > > > > apologies for messing up this simple patch of mine last month. I got > > confused by the mixed usage of "ret" and "err" in this function. This > > might endorse some cleanup, but I don't dare to touch this file again, > > especially not that late in the cycle. > > Tom, can you pick this patch directly ? OK.
On Sat, Jul 02, 2022 at 01:45:10AM +0100, Andre Przywara wrote: > Commit 81755b8c20fe ("usb: host: ehci-generic: Make resets and clocks > optional") improved the error check to cover the reset property being > optional. However this was using the wrong error variable for the > check, so would now never fail. > > Use the correct error variable for checking the result of > reset_get_bulk(), to actually report genuine errors. > > Fixes: 81755b8c20fe ("usb: host: ehci-generic: Make resets and clocks optional") > Signed-off-by: Andre Przywara <andre.przywara@arm.com> Applied to u-boot/master, thanks!
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index 15267e9a05a..75c73bfe4e8 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -81,7 +81,7 @@ static int ehci_usb_probe(struct udevice *dev) } err = reset_get_bulk(dev, &priv->resets); - if (ret && ret != -ENOENT) { + if (err && err != -ENOENT) { dev_err(dev, "Failed to get resets (err=%d)\n", err); goto clk_err; }
Commit 81755b8c20fe ("usb: host: ehci-generic: Make resets and clocks optional") improved the error check to cover the reset property being optional. However this was using the wrong error variable for the check, so would now never fail. Use the correct error variable for checking the result of reset_get_bulk(), to actually report genuine errors. Fixes: 81755b8c20fe ("usb: host: ehci-generic: Make resets and clocks optional") Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- Hi, apologies for messing up this simple patch of mine last month. I got confused by the mixed usage of "ret" and "err" in this function. This might endorse some cleanup, but I don't dare to touch this file again, especially not that late in the cycle. Cheers, Andre drivers/usb/host/ehci-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)