summaryrefslogtreecommitdiff
path: root/drivers/base/component.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2020-05-19 20:34:12 +0200
committerPeter Zijlstra <peterz@infradead.org>2020-05-19 20:34:12 +0200
commit9013196a467e770e1470cccee6c0fe435ef37c66 (patch)
tree2aefbb9d14a1a7513af9e752fe5bb80cf6b00c0c /drivers/base/component.c
parent2a0a24ebb499c9d499eea948d3fc108f936e36d4 (diff)
parent39f23ce07b9355d05a64ae303ce20d1c4b92b957 (diff)
Merge branch 'sched/urgent'
Diffstat (limited to 'drivers/base/component.c')
-rw-r--r--drivers/base/component.c8
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;