From d844efec472d7ea16b229d1c2c854bed70082278 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 13 Nov 2016 14:22:00 -0700 Subject: 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 --- common/stdio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'common/stdio.c') diff --git a/common/stdio.c b/common/stdio.c index a7d016bb9d2..4d300175301 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); -- cgit v1.2.3