From: Kieran Bingham <kieranbingham@gmail.com>
To: wsa@the-dreams.de, linux-i2c@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Kieran Bingham <kieranbingham@gmail.com>
Subject: [PATCH] i2c: return probe deferred status on dev_pm_domain_attach
Date: Sun, 11 Oct 2015 12:39:31 +0100 [thread overview]
Message-ID: <1444563571-12247-1-git-send-email-kieranbingham@gmail.com> (raw)
A change of return status was introduced in commit 3fffd1283927
("i2c: allow specifying separate wakeup interrupt in device tree")
The commit prevents the defer status being passed up the call stack
appropriately when dev_pm_domain_attach returns -EPROBE_DEFER.
To fix we change this back to the original return status;
Signed-off-by: Kieran Bingham <kieranbingham@gmail.com>
---
drivers/i2c/i2c-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 5f89f1e..df83015 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -701,7 +701,7 @@ static int i2c_device_probe(struct device *dev)
goto err_detach_pm_domain;
}
- return 0;
+ return status;
err_detach_pm_domain:
dev_pm_domain_detach(&client->dev, true);
--
2.1.4
next reply other threads:[~2015-10-11 11:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-11 11:39 Kieran Bingham [this message]
2015-10-12 7:23 ` [PATCH] i2c: return probe deferred status on dev_pm_domain_attach Wolfram Sang
2015-10-12 7:24 ` Wolfram Sang
2015-10-12 11:17 ` Kieran Bingham
2015-10-12 19:40 ` Wolfram Sang
2015-10-12 19:50 ` Kieran Bingham
2015-10-12 11:15 ` Kieran Bingham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444563571-12247-1-git-send-email-kieranbingham@gmail.com \
--to=kieranbingham@gmail.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox