korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86/pci/intel_mid_pci: Propagate actual return code

Browse Source 
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 <andriy.shevchenko@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: http://lkml.kernel.org/r/1438161409-4671-3-git-send-email-andriy.shevchenko@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Andy Shevchenko 2015-07-29 12:16:48 +03:00 committed by Thomas Gleixner
parent 39d9b77b8d
commit 2a61c8eaf1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/pci/intel_mid_pci.c
View File

@ -213,6 +213,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)
{ {
struct irq_alloc_info info; struct irq_alloc_info info;
int polarity; int polarity;
int ret;
if (dev->irq_managed && dev->irq > 0) if (dev->irq_managed && dev->irq > 0)
return 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 * MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to
* IOAPIC RTE entries, so we just enable RTE for the device. * IOAPIC RTE entries, so we just enable RTE for the device.
*/ */
if (mp_map_gsi_to_irq(dev->irq, IOAPIC_MAP_ALLOC, &info) < 0) ret = mp_map_gsi_to_irq(dev->irq, IOAPIC_MAP_ALLOC, &info);
return -EBUSY; if (ret < 0)
return ret;
dev->irq_managed = 1; dev->irq_managed = 1;