git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull asus into release branch
[pandora-kernel.git]
/
arch
/
frv
/
mb93090-mb00
/
pci-vdk.c
diff --git
a/arch/frv/mb93090-mb00/pci-vdk.c
b/arch/frv/mb93090-mb00/pci-vdk.c
index
f7279d7
..
0b581e3
100644
(file)
--- a/
arch/frv/mb93090-mb00/pci-vdk.c
+++ b/
arch/frv/mb93090-mb00/pci-vdk.c
@@
-466,6
+466,7
@@
int pcibios_enable_device(struct pci_dev *dev, int mask)
if ((err = pcibios_enable_resources(dev, mask)) < 0)
return err;
- pcibios_enable_irq(dev);
+ if (!dev->msi_enabled)
+ pcibios_enable_irq(dev);
return 0;
}