summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-05-16 14:06:12 +0200
committerTejun Heo <tj@kernel.org>2017-05-16 11:23:29 -0400
commitc034640a32f8456018d9c8c83799ead683046b95 (patch)
treeb1fe85d9bbfda55ac5fbdf75ff6a94604faeecdd /drivers/ata
parent5dc63fdcc09f47fb226b8bc7d83a61feb787d817 (diff)
downloadlinux-c034640a32f8456018d9c8c83799ead683046b95.tar.gz
linux-c034640a32f8456018d9c8c83799ead683046b95.tar.bz2
linux-c034640a32f8456018d9c8c83799ead683046b95.zip
ata: libahci: properly propagate return value of platform_get_irq()
When platform_get_irq() fails, it returns an error code, which libahci_platform and replaces it by -EINVAL. This commit fixes that by propagating the error code. It fixes the situation where platform_get_irq() returns -EPROBE_DEFER because the interrupt controller is not available yet, and generally looks like the right thing to do. We pay attention to not show the "no irq" message when we are in an EPROBE_DEFER situation, because the driver probing will be retried later on, once the interrupt controller becomes available to provide the interrupt. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libahci_platform.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
index aaa761b9081c..cd2eab6aa92e 100644
--- a/drivers/ata/libahci_platform.c
+++ b/drivers/ata/libahci_platform.c
@@ -514,8 +514,9 @@ int ahci_platform_init_host(struct platform_device *pdev,
irq = platform_get_irq(pdev, 0);
if (irq <= 0) {
- dev_err(dev, "no irq\n");
- return -EINVAL;
+ if (irq != -EPROBE_DEFER)
+ dev_err(dev, "no irq\n");
+ return irq;
}
hpriv->irq = irq;