From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752674AbdIERMf (ORCPT ); Tue, 5 Sep 2017 13:12:35 -0400 Received: from dougal.metanate.com ([90.155.101.14]:40511 "EHLO metanate.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752218AbdIERM3 (ORCPT ); Tue, 5 Sep 2017 13:12:29 -0400 From: John Keeping To: Marc Zyngier Cc: Thomas Gleixner , linux-kernel@vger.kernel.org, John Keeping Subject: [PATCH] genirq/msi: fix populating multiple interrupts Date: Tue, 5 Sep 2017 18:12:08 +0100 Message-Id: <20170905171208.17102-1-john@metanate.com> X-Mailer: git-send-email 2.14.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the correct variable to set up each interrupt in turn rather than configuring the first interrupt "nvec" times. Signed-off-by: John Keeping --- kernel/irq/msi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 48eadf416c24..3fa4bd59f569 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -315,11 +315,12 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, ops->set_desc(arg, desc); /* Assumes the domain mutex is held! */ - ret = irq_domain_alloc_irqs_hierarchy(domain, virq, 1, arg); + ret = irq_domain_alloc_irqs_hierarchy(domain, desc->irq, 1, + arg); if (ret) break; - irq_set_msi_desc_off(virq, 0, desc); + irq_set_msi_desc_off(desc->irq, 0, desc); } if (ret) { -- 2.14.1