[patch 04/47] ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable

Greg KH
2008-06-14T00:13:34Z

[-- Attachment #1: ssb-fix-context-assertion-in-ssb_pcicore_dev_irqvecs_enable.patch --]
[-- Type: text/plain, Size: 1080 bytes --]

-stable review patch. If anyone has any objections, please let us know.

------------------
From: Michael Buesch <mb@bu3sch.de>

upstream commit: a3bafeedfff2ac5fa0a316bea4570e27900b6fcc

This fixes a context assertion in ssb that makes b44 print
out warnings on resume.

This fixes the following kernel oops:
http://www.kerneloops.org/oops.php?number=12732
http://www.kerneloops.org/oops.php?number=11410

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>

---
drivers/ssb/driver_pcicore.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -519,12 +519,12 @@ int ssb_pcicore_dev_irqvecs_enable(struc
int err = 0;
u32 tmp;

- might_sleep();
-
if (!pdev)
goto out;
bus = pdev->bus;

+ might_sleep_if(pdev->id.coreid != SSB_DEV_PCI);
+
/* Enable interrupts for this device. */
if (bus->host_pci &&
((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {

--