diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-18 07:36:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-18 07:36:52 -0400 |
| commit | 700b4fe782f9fc46b7be1b1a93a49356baeccc3f (patch) | |
| tree | 7c4f01a95ceb7288ac9f95ffb59c2ea11b0a33cf /drivers/w1/w1-uclass.c | |
| parent | d3031d442b941f059eb83bb67ca10a28a0539f9a (diff) | |
| parent | ae0bf2214b81b56a5670819958234947443680be (diff) | |
Merge tag 'dm-pull-18oct22' of https://source.denx.de/u-boot/custodians/u-boot-dm
Update uclass iterators to work better when devices fail to probe
Support VBE OS requests / fixups
Minor error-handling tweaks to bootm command
Diffstat (limited to 'drivers/w1/w1-uclass.c')
| -rw-r--r-- | drivers/w1/w1-uclass.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c index 52b519c21d2..de4f25bcf95 100644 --- a/drivers/w1/w1-uclass.c +++ b/drivers/w1/w1-uclass.c @@ -16,6 +16,7 @@ #include <common.h> #include <dm.h> +#include <errno.h> #include <log.h> #include <w1.h> #include <w1-eeprom.h> @@ -182,24 +183,25 @@ static int w1_enumerate(struct udevice *bus) int w1_get_bus(int busnum, struct udevice **busp) { int ret, i = 0; - struct udevice *dev; - for (ret = uclass_first_device(UCLASS_W1, &dev); - dev && !ret; - ret = uclass_next_device(&dev), i++) { + for (ret = uclass_first_device_check(UCLASS_W1, &dev); + dev; + ret = uclass_next_device_check(&dev), i++) { if (i == busnum) { + if (ret) { + debug("Cannot probe w1 bus %d: %d (%s)\n", + busnum, ret, errno_str(ret)); + return ret; + } *busp = dev; return 0; } } - if (!ret) { - debug("Cannot find w1 bus %d\n", busnum); - ret = -ENODEV; - } + debug("Cannot find w1 bus %d\n", busnum); - return ret; + return -ENODEV; } u8 w1_get_device_family(struct udevice *dev) |