| From a6fe5cfd4e8d7bdb2a03cc328b9d1b4b5e04d910 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 14 Mar 2021 23:34:27 +0300 |
| Subject: sata_highbank: fix deferred probing |
| |
| From: Sergey Shtylyov <s.shtylyov@omprussia.ru> |
| |
| [ Upstream commit 4a24efa16e7db02306fb5db84518bb0a7ada5a46 ] |
| |
| The driver overrides the error codes returned by platform_get_irq() to |
| -EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe |
| permanently instead of the deferred probing. Switch to propagating the |
| error code upstream, still checking/overriding IRQ0 as libata regards it |
| as "no IRQ" (thus polling) anyway... |
| |
| Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") |
| Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru> |
| Link: https://lore.kernel.org/r/105b456d-1199-f6e9-ceb7-ffc5ba551d1a@omprussia.ru |
| Signed-off-by: Jens Axboe <axboe@kernel.dk> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/ata/sata_highbank.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c |
| index 64b2ef15ec19..8440203e835e 100644 |
| --- a/drivers/ata/sata_highbank.c |
| +++ b/drivers/ata/sata_highbank.c |
| @@ -469,10 +469,12 @@ 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; |
| } |
| + if (!irq) |
| + return -EINVAL; |
| |
| hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL); |
| if (!hpriv) { |
| -- |
| 2.30.2 |
| |
