From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Sergey Shtylyov <s.shtylyov@omp.ru>,
John Garry <john.garry@huawei.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Sasha Levin <sashal@kernel.org>,
linux-scsi@vger.kernel.org
Subject: [PATCH AUTOSEL 4.9 04/26] scsi: hisi_sas: Propagate errors in interrupt_init_v1_hw()
Date: Fri, 9 Jul 2021 22:35:42 -0400 [thread overview]
Message-ID: <20210710023604.3172486-4-sashal@kernel.org> (raw)
In-Reply-To: <20210710023604.3172486-1-sashal@kernel.org>
From: Sergey Shtylyov <s.shtylyov@omp.ru>
[ Upstream commit ab17122e758ef68fb21033e25c041144067975f5 ]
After commit 6c11dc060427 ("scsi: hisi_sas: Fix IRQ checks") we have the
error codes returned by platform_get_irq() ready for the propagation
upsream in interrupt_init_v1_hw() -- that will fix still broken deferred
probing. Let's propagate the error codes from devm_request_irq() as well
since I don't see the reason to override them with -ENOENT...
Link: https://lore.kernel.org/r/49ba93a3-d427-7542-d85a-b74fe1a33a73@omp.ru
Acked-by: John Garry <john.garry@huawei.com>
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index c0ac49d8bc8d..5c49806a7ae3 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1709,7 +1709,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
dev_err(dev,
"irq init: fail map phy interrupt %d\n",
idx);
- return -ENOENT;
+ return irq;
}
rc = devm_request_irq(dev, irq, phy_interrupts[j], 0,
@@ -1718,7 +1718,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
dev_err(dev, "irq init: could not request "
"phy interrupt %d, rc=%d\n",
irq, rc);
- return -ENOENT;
+ return rc;
}
}
}
@@ -1729,7 +1729,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
if (!irq) {
dev_err(dev, "irq init: could not map cq interrupt %d\n",
idx);
- return -ENOENT;
+ return irq;
}
rc = devm_request_irq(dev, irq, cq_interrupt_v1_hw, 0,
@@ -1737,7 +1737,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
if (rc) {
dev_err(dev, "irq init: could not request cq interrupt %d, rc=%d\n",
irq, rc);
- return -ENOENT;
+ return rc;
}
}
@@ -1747,7 +1747,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
if (!irq) {
dev_err(dev, "irq init: could not map fatal interrupt %d\n",
idx);
- return -ENOENT;
+ return irq;
}
rc = devm_request_irq(dev, irq, fatal_interrupts[i], 0,
@@ -1756,7 +1756,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
dev_err(dev,
"irq init: could not request fatal interrupt %d, rc=%d\n",
irq, rc);
- return -ENOENT;
+ return rc;
}
}
--
2.30.2
next prev parent reply other threads:[~2021-07-10 2:38 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-10 2:35 [PATCH AUTOSEL 4.9 01/26] tty: serial: fsl_lpuart: fix the potential risk of division or modulo by zero Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 02/26] misc/libmasm/module: Fix two use after free in ibmasm_init_one Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 03/26] Revert "ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro" Sasha Levin
2021-07-10 2:35 ` Sasha Levin [this message]
2021-07-10 9:16 ` [PATCH AUTOSEL 4.9 04/26] scsi: hisi_sas: Propagate errors in interrupt_init_v1_hw() Sergey Shtylyov
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 05/26] scsi: lpfc: Fix "Unexpected timeout" error in direct attach topology Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 06/26] tty: serial: 8250: serial_cs: Fix a memory leak in error handling path Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 07/26] fs/jfs: Fix missing error code in lmLogInit() Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 08/26] scsi: iscsi: Add iscsi_cls_conn refcount helpers Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 09/26] mfd: da9052/stmpe: Add and modify MODULE_DEVICE_TABLE Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 10/26] s390/sclp_vt220: fix console name to match device Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 11/26] USB: core: Avoid WARNings for 0-length descriptor requests Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 12/26] ALSA: sb: Fix potential double-free of CSP mixer elements Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 13/26] powerpc/ps3: Add dma_mask to ps3_dma_region Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 14/26] gpio: zynq: Check return value of pm_runtime_get_sync Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 15/26] ALSA: ppc: fix error return code in snd_pmac_probe() Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 16/26] selftests/powerpc: Fix "no_handler" EBB selftest Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 17/26] ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing() Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 18/26] ALSA: bebob: add support for ToneWeal FW66 Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 19/26] usb: gadget: f_hid: fix endianness issue with descriptors Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 20/26] usb: gadget: hid: fix error return code in hid_bind() Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 21/26] powerpc/boot: Fixup device-tree on little endian Sasha Levin
2021-07-10 2:36 ` [PATCH AUTOSEL 4.9 22/26] backlight: lm3630a: Fix return code of .update_status() callback Sasha Levin
2021-07-10 2:36 ` [PATCH AUTOSEL 4.9 23/26] ALSA: hda: Add IRQ check for platform_get_irq() Sasha Levin
2021-07-10 2:36 ` [PATCH AUTOSEL 4.9 24/26] jfs: fix GPF in diFree Sasha Levin
2021-07-10 2:36 ` [PATCH AUTOSEL 4.9 25/26] i2c: core: Disable client irq on reboot/shutdown Sasha Levin
2021-07-10 2:36 ` [PATCH AUTOSEL 4.9 26/26] lib/decompress_unlz4.c: correctly handle zero-padding around initrds Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210710023604.3172486-4-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=john.garry@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=s.shtylyov@omp.ru \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox