w1: Fix bus counting in w1_get_bus

Use uclass_first_device_check/uclass_next_device_check to correctly
count buses that fail to probe.

Fixes: d3e19cf919 ("w1: Add 1-Wire uclass")
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c
index 52b519c21d2cb18ac9eeb6ded62d924de22c2f1b..de4f25bcf95766099ba1d6eb1e5ea8e6cf60815e 100644 (file)
--- 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)