From: Simon Glass <sjg@chromium.org>
Date: Sun, 13 Nov 2016 21:22:00 +0000 (-0700)
Subject: stdio: Correct numbering logic in stdio_probe_device()
X-Git-Tag: v2017.01-rc1~210^2~17
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d844efec472d7ea16b229d1c2c854bed70082278;p=u-boot

stdio: Correct numbering logic in stdio_probe_device()

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>
---

diff --git a/common/stdio.c b/common/stdio.c
index a7d016bb9d..4d30017530 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -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);