summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-03-08 08:42:51 -0500
committerTom Rini <trini@konsulko.com>2022-03-08 08:42:51 -0500
commit589c659035a44a683b087fd75fe0b7667f7be7f5 (patch)
tree4db94ca0e040f387e14069b6f6ec929cad5240ab /drivers
parent7fed437f4049cb33b28324462c4d1ee2034fa7c0 (diff)
parentb38fbddbaa3dca0a190f9655f753e72405290431 (diff)
downloadu-boot-589c659035a44a683b087fd75fe0b7667f7be7f5.tar.gz
u-boot-589c659035a44a683b087fd75fe0b7667f7be7f5.tar.bz2
u-boot-589c659035a44a683b087fd75fe0b7667f7be7f5.zip
Merge branch '2022-03-08-assorted-fixes'
- serial uclass fix, mailmap/gitignore updates
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/serial-uclass.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 362cedd955..f30f352bd7 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -66,7 +66,8 @@ static int serial_check_stdout(const void *blob, struct udevice **devp)
*/
if (node > 0 && !lists_bind_fdt(gd->dm_root, offset_to_ofnode(node),
devp, NULL, false)) {
- if (!device_probe(*devp))
+ if (device_get_uclass_id(*devp) == UCLASS_SERIAL &&
+ !device_probe(*devp))
return 0;
}