2017-06-30 23:04:18

by Gustavo A. R. Silva

Subject: [PATCH] w1: omap-hdq: fix error return code in omap_hdq_probe()

platform_get_irq() returns an error code, but the omap_hdq
driver ignores it and always returns -ENXIO. This is not correct,
and prevents -EPROBE_DEFER from being propagated properly.
Notice that platform_get_irq() no longer returns 0 on error.

Print error message and propagate the return value of
platform_get_irq on failure.

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/w1/masters/omap_hdq.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 3612542..83fc9aa 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -704,7 +704,8 @@ static int omap_hdq_probe(struct platform_device *pdev)

irq = platform_get_irq(pdev, 0);
if (irq < 0) {
- ret = -ENXIO;
+ dev_dbg(&pdev->dev, "Failed to get IRQ: %d\n", irq);
+ ret = irq;
goto err_irq;
}

--
2.5.0

2017-07-10 19:35:07

by Gustavo A. R. Silva

Subject: Re: [PATCH] w1: omap-hdq: fix error return code in omap_hdq_probe()

Hi Evgeniy,

Quoting Evgeniy Polyakov <[email protected]>:

> Hi Gustavo, Greg
>
> 01.07.2017, 01:44, "Gustavo A. R. Silva" <[email protected]>:
>> platform_get_irq() returns an error code, but the omap_hdq
>> driver ignores it and always returns -ENXIO. This is not correct,
>> and prevents -EPROBE_DEFER from being propagated properly.
>> Notice that platform_get_irq() no longer returns 0 on error.
>>
>> Print error message and propagate the return value of
>> platform_get_irq on failure.
>>
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>
> Looks good to me, thank you.
>

Glad to help. :)

> Greg, please pull it into the tree.
> Acked-by: Evgeniy Polyakov <[email protected]>
>
>> ---
>>  drivers/w1/masters/omap_hdq.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
>> index 3612542..83fc9aa 100644
>> --- a/drivers/w1/masters/omap_hdq.c
>> +++ b/drivers/w1/masters/omap_hdq.c
>> @@ -704,7 +704,8 @@ static int omap_hdq_probe(struct platform_device *pdev)
>>
>>          irq = platform_get_irq(pdev, 0);
>>          if (irq < 0) {
>> - ret = -ENXIO;
>> + dev_dbg(&pdev->dev, "Failed to get IRQ: %d\n", irq);
>> + ret = irq;
>>                  goto err_irq;
>>          }
>>
>> --
>> 2.5.0
--
Gustavo A. R. Silva