projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux...
[deliverable/linux.git]
/
arch
/
x86
/
pci
/
intel_mid_pci.c
diff --git
a/arch/x86/pci/intel_mid_pci.c
b/arch/x86/pci/intel_mid_pci.c
index efb849323c745899f5e665364ceec36a1d15cb9d..852aa4c92da027cb07fb64c77c855aaf0877a1da 100644
(file)
--- a/
arch/x86/pci/intel_mid_pci.c
+++ b/
arch/x86/pci/intel_mid_pci.c
@@
-234,10
+234,10
@@
static int intel_mid_pci_irq_enable(struct pci_dev *dev)
static void intel_mid_pci_irq_disable(struct pci_dev *dev)
{
- if (dev->irq_managed && dev->irq > 0) {
+ if (!mp_should_keep_irq(&dev->dev) && dev->irq_managed &&
+ dev->irq > 0) {
mp_unmap_irq(dev->irq);
dev->irq_managed = 0;
- dev->irq = 0;
}
}
This page took
0.02854 seconds
and
5
git commands to generate.