diff options
author | Tony Lindgren <tony@atomide.com> | 2020-06-08 19:14:49 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2020-06-08 19:14:49 +0200 |
commit | 4263eb6880df8383fff0efb872278a99eb6142c8 (patch) | |
tree | 67ab9bf228e4f5f341f9408e055180932b39fe06 /drivers/base/component.c | |
parent | bus: ti-sysc: Increase max softreset wait (diff) | |
parent | ARM: dts: dra7-evm-common: Fix duplicate mailbox nodes (diff) | |
download | linux-4263eb6880df8383fff0efb872278a99eb6142c8.tar.xz linux-4263eb6880df8383fff0efb872278a99eb6142c8.zip |
Merge branch 'fixes-v5.7' into fixes
Diffstat (limited to 'drivers/base/component.c')
-rw-r--r-- | drivers/base/component.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/base/component.c b/drivers/base/component.c index e97704104784..dcfbe7251dc4 100644 --- a/drivers/base/component.c +++ b/drivers/base/component.c @@ -256,7 +256,8 @@ static int try_to_bring_up_master(struct master *master, ret = master->ops->bind(master->dev); if (ret < 0) { devres_release_group(master->dev, NULL); - dev_info(master->dev, "master bind failed: %d\n", ret); + if (ret != -EPROBE_DEFER) + dev_info(master->dev, "master bind failed: %d\n", ret); return ret; } @@ -611,8 +612,9 @@ static int component_bind(struct component *component, struct master *master, devres_release_group(component->dev, NULL); devres_release_group(master->dev, NULL); - dev_err(master->dev, "failed to bind %s (ops %ps): %d\n", - dev_name(component->dev), component->ops, ret); + if (ret != -EPROBE_DEFER) + dev_err(master->dev, "failed to bind %s (ops %ps): %d\n", + dev_name(component->dev), component->ops, ret); } return ret; |