All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Andy Shevchenko <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de,
	linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com
Subject: [tip:x86/platform] x86/ioapic: Return suitable error code in mp_map_gsi_to_irq()
Date: Fri, 20 Jan 2017 01:10:13 -0800	[thread overview]
Message-ID: <tip-358e96deaed3330a59d9dd6a7e419f4da08d6497@git.kernel.org> (raw)
In-Reply-To: <20170119192425.189899-2-andriy.shevchenko@linux.intel.com>

Commit-ID:  358e96deaed3330a59d9dd6a7e419f4da08d6497
Gitweb:     http://git.kernel.org/tip/358e96deaed3330a59d9dd6a7e419f4da08d6497
Author:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
AuthorDate: Thu, 19 Jan 2017 21:24:22 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
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 <andriy.shevchenko@linux.intel.com>
Link: http://lkml.kernel.org/r/20170119192425.189899-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 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);
 }

  reply	other threads:[~2017-01-20  9:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-19 19:24 [PATCH v4 0/4] x86/platform/intel-mid: Fix RTC / WDT handling Andy Shevchenko
2017-01-19 19:24 ` [PATCH v4 1/4] x86/ioapic: Return suitable error code in mp_map_gsi_to_irq() Andy Shevchenko
2017-01-20  9:10   ` tip-bot for Andy Shevchenko [this message]
2017-01-19 19:24 ` [PATCH v4 2/4] x86/platform/intel-mid: Allocate RTC interrupt for Merrifield Andy Shevchenko
2017-01-20  9:10   ` [tip:x86/platform] " tip-bot for Andy Shevchenko
2017-01-19 19:24 ` [PATCH v4 3/4] x86/platform/intel-mid: Don't shadow error code of mp_map_gsi_to_irq() Andy Shevchenko
2017-01-20  9:11   ` [tip:x86/platform] " tip-bot for Andy Shevchenko
2017-01-19 19:24 ` [PATCH v4 4/4] x86/platform/intel-mid: Move watchdog registration to arch_initcall() Andy Shevchenko
2017-01-20  9:11   ` [tip:x86/platform] " tip-bot for Andy Shevchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-358e96deaed3330a59d9dd6a7e419f4da08d6497@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.