Skip to contentSkip to conversation

ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable

PATCH New Michael Buesch 1 participant 1 message Jun 2, 2008

Subsystems (3)
Networking Network drivers Sonics silicon backplane driver (ssb)
lore
Share & tools
lore

Michael Buesch

author
#0 lore raw

PATCH 1/1 ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable

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 <[email protected]>

---

John, please apply to 2.6.26.

drivers/ssb/driver_pcicore.c +2 -2
Index: wireless-testing/drivers/ssb/driver_pcicore.c
===================================================================
@@ -537,12 +537,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))) {
Signature · 1 line
Greetings Michael.