| From b34c6fab2b5f42afec2cb34048fe9f952a39155e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 15 Mar 2021 23:15:06 +0300 |
| Subject: ata: libahci_platform: fix IRQ check |
| |
| From: Sergey Shtylyov <s.shtylyov@omprussia.ru> |
| |
| [ Upstream commit b30d0040f06159de97ad9c0b1536f47250719d7d ] |
| |
| Iff platform_get_irq() returns 0, ahci_platform_init_host() would return 0 |
| early (as if the call was successful). Override IRQ0 with -EINVAL instead |
| as the 'libata' regards 0 as "no IRQ" (thus polling) anyway... |
| |
| Fixes: c034640a32f8 ("ata: libahci: properly propagate return value of platform_get_irq()") |
| Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru> |
| Link: https://lore.kernel.org/r/4448c8cc-331f-2915-0e17-38ea34e251c8@omprussia.ru |
| Signed-off-by: Jens Axboe <axboe@kernel.dk> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/ata/libahci_platform.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c |
| index de638dafce21..b2f552088291 100644 |
| --- a/drivers/ata/libahci_platform.c |
| +++ b/drivers/ata/libahci_platform.c |
| @@ -582,11 +582,13 @@ int ahci_platform_init_host(struct platform_device *pdev, |
| int i, irq, n_ports, rc; |
| |
| irq = platform_get_irq(pdev, 0); |
| - if (irq <= 0) { |
| + if (irq < 0) { |
| if (irq != -EPROBE_DEFER) |
| dev_err(dev, "no irq\n"); |
| return irq; |
| } |
| + if (!irq) |
| + return -EINVAL; |
| |
| hpriv->irq = irq; |
| |
| -- |
| 2.30.2 |
| |
