From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754158AbbG2ThJ (ORCPT ); Wed, 29 Jul 2015 15:37:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35628 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753957AbbG2ThH (ORCPT ); Wed, 29 Jul 2015 15:37:07 -0400 Date: Wed, 29 Jul 2015 12:36:56 -0700 From: tip-bot for Andy Shevchenko Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, bhelgaas@google.com Reply-To: bhelgaas@google.com, tglx@linutronix.de, andriy.shevchenko@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <1438161409-4671-3-git-send-email-andriy.shevchenko@linux.intel.com> References: <1438161409-4671-3-git-send-email-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/pci/intel_mid_pci: Propagate actual return code Git-Commit-ID: 2a61c8eaf1879db99286c3f5fe5e78086c7edb85 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2a61c8eaf1879db99286c3f5fe5e78086c7edb85 Gitweb: http://git.kernel.org/tip/2a61c8eaf1879db99286c3f5fe5e78086c7edb85 Author: Andy Shevchenko AuthorDate: Wed, 29 Jul 2015 12:16:48 +0300 Committer: Thomas Gleixner CommitDate: Wed, 29 Jul 2015 21:23:50 +0200 x86/pci/intel_mid_pci: Propagate actual return code mp_map_gsi_to_irq() returns different codes if it fails. intel_mid_pci_irq_enable() hides this under -EBUSY. Return the actual failure code. Signed-off-by: Andy Shevchenko Cc: Bjorn Helgaas Link: http://lkml.kernel.org/r/1438161409-4671-3-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/pci/intel_mid_pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c index 7553921..3361f0a 100644 --- a/arch/x86/pci/intel_mid_pci.c +++ b/arch/x86/pci/intel_mid_pci.c @@ -213,6 +213,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) { struct irq_alloc_info info; int polarity; + int ret; if (dev->irq_managed && dev->irq > 0) return 0; @@ -244,8 +245,9 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) * MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to * IOAPIC RTE entries, so we just enable RTE for the device. */ - if (mp_map_gsi_to_irq(dev->irq, IOAPIC_MAP_ALLOC, &info) < 0) - return -EBUSY; + ret = mp_map_gsi_to_irq(dev->irq, IOAPIC_MAP_ALLOC, &info); + if (ret < 0) + return ret; dev->irq_managed = 1;