Re: [PATCH v2] i2c: return probe deferred status on dev_pm_domain_attach

[Kieran Bingham]

On 12 October 2015 at 21:17, Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> wrote:
> On Mon, Oct 12, 2015 at 12:49 PM, Kieran Bingham
> <kieranbingham@xxxxxxxxx> wrote:
>> 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.
>
> Ah, indeed, sorry about that.
>
>>
>> Catch the PROBE_DEFER and clear up the IRQ wakeup status
>>
>> Signed-off-by: Kieran Bingham <kieranbingham@xxxxxxxxx>
>> Fixes: 3fffd1283927 ("i2c: allow specifying separate wakeup
>> interrupt in device tree")
>>
>> ---
>> V2:
>>  Fall through the error path before returning -EPROBE_DEFER
>>
>>  drivers/i2c/i2c-core.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
>> index 5f89f1e3c2f2..51f20cce1732 100644
>> --- a/drivers/i2c/i2c-core.c
>> +++ b/drivers/i2c/i2c-core.c
>> @@ -699,6 +699,8 @@ static int i2c_device_probe(struct device *dev)
>>                                         client));
>>                 if (status)
>>                         goto err_detach_pm_domain;
>> +       } else {
>> +               goto err_clear_wakeup_irq;
>>         }
>
> How about we do:
>
>         status = dev_pm_domain_attach(&client->dev, true);
>         if (status == -EPROBE_DEFER)
>                 goto err_clear_wakeup_irq;
>
>         status = driver->probe(client, i2c_match_id(driver->id_table, client));
>         ....
>
> instead of doing "else"?

Well in fact - this is actually what I do in the next set of patches
I'm working on which led me to find this fault.
 (i2c: Provide a temporary .probe2() call-back type)

And so ... v3 ... so much for my quick one word bugfix patch :)

I'll send v3 with the if/else removed

--
Kieran


>
> Thanks.
>
> --
> Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/