* [PATCH] i2c: return probe deferred status on dev_pm_domain_attach
@ 2015-10-11 11:39 Kieran Bingham
2015-10-12 7:23 ` Wolfram Sang
0 siblings, 1 reply; 7+ messages in thread
From: Kieran Bingham @ 2015-10-11 11:39 UTC (permalink / raw)
To: wsa, linux-i2c; +Cc: linux-kernel, Kieran Bingham
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] i2c: return probe deferred status on dev_pm_domain_attach
2015-10-11 11:39 [PATCH] i2c: return probe deferred status on dev_pm_domain_attach Kieran Bingham
@ 2015-10-12 7:23 ` Wolfram Sang
2015-10-12 7:24 ` Wolfram Sang
2015-10-12 11:15 ` Kieran Bingham
0 siblings, 2 replies; 7+ messages in thread
From: Wolfram Sang @ 2015-10-12 7:23 UTC (permalink / raw)
To: Kieran Bingham; +Cc: linux-i2c, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 606 bytes --]
Hi Kiera,
On Sun, Oct 11, 2015 at 12:39:31PM +0100, Kieran Bingham wrote:
> A change of return status was introduced in commit 3fffd1283927
> ("i2c: allow specifying separate wakeup interrupt in device tree")
Thanks for catching this!
> 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;
What about going to the error path?
> Signed-off-by: Kieran Bingham <kieranbingham@gmail.com>
Please add a "Fixes: <sha1>" tag here.
Wolfram
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] i2c: return probe deferred status on dev_pm_domain_attach
2015-10-12 7:23 ` Wolfram Sang
@ 2015-10-12 7:24 ` Wolfram Sang
2015-10-12 11:17 ` Kieran Bingham
2015-10-12 11:15 ` Kieran Bingham
1 sibling, 1 reply; 7+ messages in thread
From: Wolfram Sang @ 2015-10-12 7:24 UTC (permalink / raw)
To: Kieran Bingham; +Cc: linux-i2c, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 58 bytes --]
And add the original patch author to CC when resending.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] i2c: return probe deferred status on dev_pm_domain_attach
2015-10-12 7:23 ` Wolfram Sang
2015-10-12 7:24 ` Wolfram Sang
@ 2015-10-12 11:15 ` Kieran Bingham
1 sibling, 0 replies; 7+ messages in thread
From: Kieran Bingham @ 2015-10-12 11:15 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-i2c, linux-kernel
Hi Wolfram,
On 12 October 2015 at 08:23, Wolfram Sang <wsa@the-dreams.de> wrote:
> Hi Kiera,
>
> On Sun, Oct 11, 2015 at 12:39:31PM +0100, Kieran Bingham wrote:
>> A change of return status was introduced in commit 3fffd1283927
>> ("i2c: allow specifying separate wakeup interrupt in device tree")
>
> Thanks for catching this!
NP : Saw it when re-basing my other series.
>> 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;
>
> What about going to the error path?
Sounds reasonable :D
>> Signed-off-by: Kieran Bingham <kieranbingham@gmail.com>
>
> Please add a "Fixes: <sha1>" tag here.
Sure.
>
> Wolfram
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] i2c: return probe deferred status on dev_pm_domain_attach
2015-10-12 7:24 ` Wolfram Sang
@ 2015-10-12 11:17 ` Kieran Bingham
2015-10-12 19:40 ` Wolfram Sang
0 siblings, 1 reply; 7+ messages in thread
From: Kieran Bingham @ 2015-10-12 11:17 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-i2c, linux-kernel
On 12 October 2015 at 08:24, Wolfram Sang <wsa@the-dreams.de> wrote:
>
> And add the original patch author to CC when resending.
>
Bah - I was sure I'd added him ... must have slipped.
Should I add Cc: stable? or are they notified from the Fixes: tag?
--
Regards
Kieran
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] i2c: return probe deferred status on dev_pm_domain_attach
2015-10-12 11:17 ` Kieran Bingham
@ 2015-10-12 19:40 ` Wolfram Sang
2015-10-12 19:50 ` Kieran Bingham
0 siblings, 1 reply; 7+ messages in thread
From: Wolfram Sang @ 2015-10-12 19:40 UTC (permalink / raw)
To: Kieran Bingham; +Cc: linux-i2c, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
> Should I add Cc: stable? or are they notified from the Fixes: tag?
My preference is: I'll add stable when I commit to my tree. I am happy
if people tell me when they think this should be done.
In this case, it should :)
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] i2c: return probe deferred status on dev_pm_domain_attach
2015-10-12 19:40 ` Wolfram Sang
@ 2015-10-12 19:50 ` Kieran Bingham
0 siblings, 0 replies; 7+ messages in thread
From: Kieran Bingham @ 2015-10-12 19:50 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-i2c, linux-kernel
On 12 October 2015 at 20:40, Wolfram Sang <wsa@the-dreams.de> wrote:
>
>> Should I add Cc: stable? or are they notified from the Fixes: tag?
>
> My preference is: I'll add stable when I commit to my tree. I am happy
> if people tell me when they think this should be done.
>
> In this case, it should :)
>
Agreed :)
I'm happy to follow your process and preference and let you add.
- Patch v2 posted.
--
Regards
Kieran
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-10-12 19:51 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-11 11:39 [PATCH] i2c: return probe deferred status on dev_pm_domain_attach Kieran Bingham
2015-10-12 7:23 ` 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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.