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
/
cris
/
arch-v32
/
drivers
/
pci
/
bios.c
diff --git
a/arch/cris/arch-v32/drivers/pci/bios.c
b/arch/cris/arch-v32/drivers/pci/bios.c
index
a2b9c60
..
5b79a7a
100644
(file)
--- a/
arch/cris/arch-v32/drivers/pci/bios.c
+++ b/
arch/cris/arch-v32/drivers/pci/bios.c
@@
-100,7
+100,9
@@
int pcibios_enable_device(struct pci_dev *dev, int mask)
if ((err = pcibios_enable_resources(dev, mask)) < 0)
return err;
- return pcibios_enable_irq(dev);
+ if (!dev->msi_enabled)
+ pcibios_enable_irq(dev);
+ return 0;
}
int pcibios_assign_resources(void)