* [patch 04/47] ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable
[not found] ` <20080614000840.GA24659@suse.de>
@ 2008-06-14 0:10 ` Greg KH
0 siblings, 0 replies; only message in thread
From: Greg KH @ 2008-06-14 0:10 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap,
Dave Jones, Chuck Wolber, Chris Wedgwood, Michael Krufky,
Chuck Ebbert, Domenico Andreoli, Willy Tarreau, torvalds, akpm,
alan, netdev, Michael Buesch, John W. Linville, Chris Wright
[-- 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))) {
--
^ permalink raw reply [flat|nested] only message in thread