---

yaml --- r: 97681 b: refs/heads/master c: a3bafee h: refs/heads/master i: 97679: c70200d v: v3
git-mirror · Jun 4, 2008 · 41f1ef1 · 41f1ef1
1 parent ae5bc4e
commit 41f1ef1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a75eda43dc4a64d0bd0502da546871c01f70e899
+refs/heads/master: a3bafeedfff2ac5fa0a316bea4570e27900b6fcc
diff --git a/trunk/drivers/ssb/driver_pcicore.c b/trunk/drivers/ssb/driver_pcicore.c
@@ -537,12 +537,12 @@ int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
 	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))) {