2017-06-30 05:03:13

by Gustavo A. R. Silva

Subject: [PATCH] sata_highbank: fix error return code in ahci_highbank_probe()

Propagate the return value of platform_get_irq on failure.

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/ata/sata_highbank.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index aafb8cc..2fc451c 100644
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -483,9 +483,9 @@ static int ahci_highbank_probe(struct platform_device *pdev)
}

irq = platform_get_irq(pdev, 0);
- if (irq <= 0) {
+ if (irq < 0) {
dev_err(dev, "no irq\n");
- return -EINVAL;
+ return irq;
}

hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL);
--
2.5.0

2017-06-30 21:20:49

by Gustavo A. R. Silva

Subject: [PATCH v2] sata_highbank: fix error return code in ahci_highbank_probe()

platform_get_irq() returns an error code, but the sata_highbank
driver ignores it and always returns -EINVAL. This is not correct,
and prevents -EPROBE_DEFER from being propagated properly.
Also, 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]>
---
Changes in v2:
Rewrite commit message.

drivers/ata/sata_highbank.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index aafb8cc..1419cf9 100644
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -483,9 +483,9 @@ static int ahci_highbank_probe(struct platform_device *pdev)
}

irq = platform_get_irq(pdev, 0);
- if (irq <= 0) {
- dev_err(dev, "no irq\n");
- return -EINVAL;
+ if (irq < 0) {
+ dev_err(dev, "failed to get IRQ: %d\n", irq);
+ return irq;
}

hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL);
--
2.5.0

2017-06-30 21:21:25

by Sergei Shtylyov

Subject: Re: [PATCH] sata_highbank: fix error return code in ahci_highbank_probe()

On 06/30/2017 08:03 AM, Gustavo A. R. Silva wrote:

> Propagate the return value of platform_get_irq on failure.

Needs the same explanations as the sata_rcar patch.

> Signed-off-by: Gustavo A. R. Silva <[email protected]>
[...]

MBR, Sergei

2017-06-30 21:24:15

by Gustavo A. R. Silva

Subject: Re: [PATCH] sata_highbank: fix error return code in ahci_highbank_probe()

Quoting Sergei Shtylyov <[email protected]>:

> On 06/30/2017 08:03 AM, Gustavo A. R. Silva wrote:
>
>> Propagate the return value of platform_get_irq on failure.
>
> Needs the same explanations as the sata_rcar patch.
>

Yep, I already sent v2 a minute ago.

Thanks!
--
Gustavo A. R. Silva