From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762414AbYFGP66 (ORCPT ); Sat, 7 Jun 2008 11:58:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758740AbYFGP6l (ORCPT ); Sat, 7 Jun 2008 11:58:41 -0400 Received: from vs166246.vserver.de ([62.75.166.246]:47481 "EHLO vs166246.vserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760061AbYFGP6k (ORCPT ); Sat, 7 Jun 2008 11:58:40 -0400 From: Michael Buesch To: stable@kernel.org Subject: [PATCH stable] ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable Date: Sat, 7 Jun 2008 17:57:37 +0200 User-Agent: KMail/1.9.6 (enterprise 0.20070907.709405) Cc: netdev@vger.kernel.org, "linux-kernel" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200806071757.38139.mb@bu3sch.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Upstream commit is a3bafeedfff2ac5fa0a316bea4570e27900b6fcc Signed-off-by: Michael Buesch Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c =================================================================== --- linux-2.6.25.4.orig/drivers/ssb/driver_pcicore.c 2008-05-22 16:35:41.000000000 +0200 +++ linux-2.6.25.4/drivers/ssb/driver_pcicore.c 2008-06-07 17:20:55.000000000 +0200 @@ -516,18 +516,18 @@ int ssb_pcicore_dev_irqvecs_enable(struc { struct ssb_device *pdev = pc->dev; struct ssb_bus *bus; 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))) { u32 coremask; /* Calculate the "coremask" for the device. */