aboutsummaryrefslogtreecommitdiff
path: root/drivers/core/uclass.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-08-09 09:27:06 -0400
committerTom Rini <trini@konsulko.com>2021-08-09 09:27:06 -0400
commit0dec2030ccc686eae4616d1ce57d41eaed15685e (patch)
tree5e9a34e4d51c4587a2138a2de969361ad3ec1f2c /drivers/core/uclass.c
parent3823315cbedf930c52fe77452063ab6d62b157be (diff)
parente679f39f7fc3eb083b2f957d748f81bbdc28f28c (diff)
Merge tag 'dm-pull-8aug21' of https://source.denx.de/u-boot/custodians/u-boot-dm
Use log subsystem for dm_warn() Various minor bug fixes
Diffstat (limited to 'drivers/core/uclass.c')
-rw-r--r--drivers/core/uclass.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 117d35ac49..3146dfd032 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -146,6 +146,9 @@ int uclass_get(enum uclass_id id, struct uclass **ucp)
{
struct uclass *uc;
+ /* Immediately fail if driver model is not set up */
+ if (!gd->uclass_root)
+ return -EDEADLK;
*ucp = NULL;
uc = uclass_find(id);
if (!uc) {