]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
stdio: Correct numbering logic in stdio_probe_device()
authorSimon Glass <sjg@chromium.org>
Sun, 13 Nov 2016 21:22:00 +0000 (14:22 -0700)
committerSimon Glass <sjg@chromium.org>
Sat, 26 Nov 2016 00:59:30 +0000 (17:59 -0700)
The current code assumes that the devices are ordered corresponding to
their alias value. But (for example) video1 can come before video0 in the
device tree.

Correct this, by always looking for device 0 first. After that we can fall
back to finding the first available device.

Signed-off-by: Simon Glass <sjg@chromium.org>
common/stdio.c

index a7d016bb9d2409d3e226afe41495fe30d69063d8..4d300175301877c1aeeb438fc67ccb3389fedceb 100644 (file)
@@ -151,9 +151,10 @@ static int stdio_probe_device(const char *name, enum uclass_id id,
        *sdevp = NULL;
        seq = trailing_strtoln(name, NULL);
        if (seq == -1)
+               seq = 0;
+       ret = uclass_get_device_by_seq(id, seq, &dev);
+       if (ret == -ENODEV)
                ret = uclass_first_device_err(id, &dev);
-       else
-               ret = uclass_get_device_by_seq(id, seq, &dev);
        if (ret) {
                debug("No %s device for seq %d (%s)\n", uclass_get_name(id),
                      seq, name);