Skip to content
Snippets Groups Projects
Commit 7d81167e authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Greg Kroah-Hartman
Browse files

scsi: hisi_sas: Fix IRQ checks

[ Upstream commit 6c11dc06 ]

Commit df2d8213 ("hisi_sas: use platform_get_irq()") failed to take
into account that irq_of_parse_and_map() and platform_get_irq() have a
different way of indicating an error: the former returns 0 and the latter
returns a negative error code. Fix up the IRQ checks!

Link: https://lore.kernel.org/r/810f26d3-908b-1d6b-dc5c-40019726baca@omprussia.ru


Fixes: df2d8213 ("hisi_sas: use platform_get_irq()")
Acked-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omprussia.ru>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent aa83f32d
No related branches found
No related tags found
No related merge requests found
...@@ -1644,7 +1644,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) ...@@ -1644,7 +1644,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
idx = i * HISI_SAS_PHY_INT_NR; idx = i * HISI_SAS_PHY_INT_NR;
for (j = 0; j < HISI_SAS_PHY_INT_NR; j++, idx++) { for (j = 0; j < HISI_SAS_PHY_INT_NR; j++, idx++) {
irq = platform_get_irq(pdev, idx); irq = platform_get_irq(pdev, idx);
if (!irq) { if (irq < 0) {
dev_err(dev, "irq init: fail map phy interrupt %d\n", dev_err(dev, "irq init: fail map phy interrupt %d\n",
idx); idx);
return -ENOENT; return -ENOENT;
...@@ -1663,7 +1663,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) ...@@ -1663,7 +1663,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
idx = hisi_hba->n_phy * HISI_SAS_PHY_INT_NR; idx = hisi_hba->n_phy * HISI_SAS_PHY_INT_NR;
for (i = 0; i < hisi_hba->queue_count; i++, idx++) { for (i = 0; i < hisi_hba->queue_count; i++, idx++) {
irq = platform_get_irq(pdev, idx); irq = platform_get_irq(pdev, idx);
if (!irq) { if (irq < 0) {
dev_err(dev, "irq init: could not map cq interrupt %d\n", dev_err(dev, "irq init: could not map cq interrupt %d\n",
idx); idx);
return -ENOENT; return -ENOENT;
...@@ -1681,7 +1681,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) ...@@ -1681,7 +1681,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
idx = (hisi_hba->n_phy * HISI_SAS_PHY_INT_NR) + hisi_hba->queue_count; idx = (hisi_hba->n_phy * HISI_SAS_PHY_INT_NR) + hisi_hba->queue_count;
for (i = 0; i < HISI_SAS_FATAL_INT_NR; i++, idx++) { for (i = 0; i < HISI_SAS_FATAL_INT_NR; i++, idx++) {
irq = platform_get_irq(pdev, idx); irq = platform_get_irq(pdev, idx);
if (!irq) { if (irq < 0) {
dev_err(dev, "irq init: could not map fatal interrupt %d\n", dev_err(dev, "irq init: could not map fatal interrupt %d\n",
idx); idx);
return -ENOENT; return -ENOENT;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment