summaryrefslogtreecommitdiff
path: root/drivers/of/overlay.c
diff options
context:
space:
mode:
authorFrank Rowand <frank.rowand@sony.com>2017-10-20 00:18:27 +0300
committerRob Herring <robh@kernel.org>2017-10-20 01:15:09 +0300
commita1d19bd4cf1febf0d5ff60243826a248bd20f1a5 (patch)
treefefe9f95d45238c057c2caaac496994786c339d4 /drivers/of/overlay.c
parent34ca5d76f250d4ba98c4cdc069ab79b395f9ecac (diff)
downloadlinux-a1d19bd4cf1febf0d5ff60243826a248bd20f1a5.tar.xz
of: overlay: pr_err from return NOTIFY_OK to overlay apply/remove
A device tree overlay notifier can return NOTIFY_OK, NOTIFY_STOP, or an embedded errno. overlay_notify() incorrectly reports an error for NOTIFY_OK. Reported-by: atull@kernel.org Signed-off-by: Frank Rowand <frank.rowand@sony.com> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of/overlay.c')
-rw-r--r--drivers/of/overlay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index c99842bb4b09..f5fce0fea40b 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -133,7 +133,7 @@ static int overlay_notify(struct overlay_changeset *ovcs,
ret = blocking_notifier_call_chain(&overlay_notify_chain,
action, &nd);
- if (ret == NOTIFY_STOP)
+ if (ret == NOTIFY_OK || ret == NOTIFY_STOP)
return 0;
if (ret) {
ret = notifier_to_errno(ret);