The patch titled ssb: fix context assertion in ssb_pcicore_dev_irqvecs_enable has been added to the -mm tree. Its filename is ssb-fix-context-assertion-in-ssb_pcicore_dev_irqvecs_enable.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ssb: fix context assertion in ssb_pcicore_dev_irqvecs_enable From: Michael Buesch <mb@xxxxxxxxx> 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@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/ssb/driver_pcicore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/ssb/driver_pcicore.c~ssb-fix-context-assertion-in-ssb_pcicore_dev_irqvecs_enable drivers/ssb/driver_pcicore.c --- a/drivers/ssb/driver_pcicore.c~ssb-fix-context-assertion-in-ssb_pcicore_dev_irqvecs_enable +++ a/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))) { _ Patches currently in -mm which might be from mb@xxxxxxxxx are origin.patch linux-next.patch ssb-fix-context-assertion-in-ssb_pcicore_dev_irqvecs_enable.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html