aboutsummaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-03-28 15:36:09 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-28 13:59:37 -0700
commitbba6f6fc68e74d4572028646f61dd3505a68747e (patch)
treee593440b5944676af7ec6b85c14acbd9ac7b72c7 /arch/cris
parent4dfc896e90359df04c80da5ab08ec31e87846c43 (diff)
downloadlinux-2.6.34-ux500-bba6f6fc68e74d4572028646f61dd3505a68747e.tar.gz
[PATCH] MSI-X: fix resume crash
So I think the right solution is to simply make pci_enable_device just flip enable bits and move the rest of the work someplace else. However a thorough cleanup is a little extreme for this point in the release cycle, so I think a quick hack that makes the code not stomp the irq when msi irq's are enabled should be the first fix. Then we can later make the code not change the irqs at all. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v32/drivers/pci/bios.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
index a2b9c60c277..5b79a7a772d 100644
--- 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)