Skip to content

Commit 112eaa8

Browse files
lvjianmin-loongsonMarc Zyngier
authored andcommitted
irqchip/loongson-eiointc: Fix returned value on parsing MADT
In pch_pic_parse_madt(), a NULL parent pointer will be returned from acpi_get_vec_parent() for second pch-pic domain related to second bridge while calling eiointc_acpi_init() at first time, where the parent of it has not been initialized yet, and will be initialized during second time calling eiointc_acpi_init(). So, it's reasonable to return zero so that failure of acpi_table_parse_madt() will be avoided, or else acpi_cascade_irqdomain_init() will return and initialization of followed pch_msi domain will be skipped. Although it does not matter when pch_msi_parse_madt() returns -EINVAL if no invalid parent is found, it's also reasonable to return zero for that. Cc: stable@vger.kernel.org Signed-off-by: Jianmin Lv <lvjianmin@loongson.cn> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20230407083453.6305-2-lvjianmin@loongson.cn
1 parent e8d018d commit 112eaa8

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/irqchip/irq-loongson-eiointc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ static int __init pch_pic_parse_madt(union acpi_subtable_headers *header,
343343
if (parent)
344344
return pch_pic_acpi_init(parent, pchpic_entry);
345345

346-
return -EINVAL;
346+
return 0;
347347
}
348348

349349
static int __init pch_msi_parse_madt(union acpi_subtable_headers *header,
@@ -355,7 +355,7 @@ static int __init pch_msi_parse_madt(union acpi_subtable_headers *header,
355355
if (parent)
356356
return pch_msi_acpi_init(parent, pchmsi_entry);
357357

358-
return -EINVAL;
358+
return 0;
359359
}
360360

361361
static int __init acpi_cascade_irqdomain_init(void)

0 commit comments

Comments
 (0)