From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751611AbdATJKX (ORCPT ); Fri, 20 Jan 2017 04:10:23 -0500 Received: from terminus.zytor.com ([65.50.211.136]:46194 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751569AbdATJKV (ORCPT ); Fri, 20 Jan 2017 04:10:21 -0500 Date: Fri, 20 Jan 2017 01:10:13 -0800 From: tip-bot for Andy Shevchenko Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com, mingo@kernel.org, hpa@zytor.com In-Reply-To: <20170119192425.189899-2-andriy.shevchenko@linux.intel.com> References: <20170119192425.189899-2-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/ioapic: Return suitable error code in mp_map_gsi_to_irq() Git-Commit-ID: 358e96deaed3330a59d9dd6a7e419f4da08d6497 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: 358e96deaed3330a59d9dd6a7e419f4da08d6497 Gitweb: http://git.kernel.org/tip/358e96deaed3330a59d9dd6a7e419f4da08d6497 Author: Andy Shevchenko AuthorDate: Thu, 19 Jan 2017 21:24:22 +0200 Committer: Thomas Gleixner CommitDate: Fri, 20 Jan 2017 10:07:41 +0100 x86/ioapic: Return suitable error code in mp_map_gsi_to_irq() mp_map_gsi_to_irq() in some cases might return legacy -1, which would be wrongly interpreted as -EPERM. Correct those cases to return proper error code. Signed-off-by: Andy Shevchenko Link: http://lkml.kernel.org/r/20170119192425.189899-2-andriy.shevchenko@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/io_apic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 945e512..f62c38d 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1107,12 +1107,12 @@ int mp_map_gsi_to_irq(u32 gsi, unsigned int flags, struct irq_alloc_info *info) ioapic = mp_find_ioapic(gsi); if (ioapic < 0) - return -1; + return -ENODEV; pin = mp_find_ioapic_pin(ioapic, gsi); idx = find_irq_entry(ioapic, pin, mp_INT); if ((flags & IOAPIC_MAP_CHECK) && idx < 0) - return -1; + return -ENODEV; return mp_map_pin_to_irq(gsi, idx, ioapic, pin, flags, info); }