mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-04-13 09:54:04 +00:00
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 <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
a75eda43dc
commit
a3bafeedff
1 changed files with 2 additions and 2 deletions
|
@ -537,12 +537,12 @@ int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
|
||||||
int err = 0;
|
int err = 0;
|
||||||
u32 tmp;
|
u32 tmp;
|
||||||
|
|
||||||
might_sleep();
|
|
||||||
|
|
||||||
if (!pdev)
|
if (!pdev)
|
||||||
goto out;
|
goto out;
|
||||||
bus = pdev->bus;
|
bus = pdev->bus;
|
||||||
|
|
||||||
|
might_sleep_if(pdev->id.coreid != SSB_DEV_PCI);
|
||||||
|
|
||||||
/* Enable interrupts for this device. */
|
/* Enable interrupts for this device. */
|
||||||
if (bus->host_pci &&
|
if (bus->host_pci &&
|
||||||
((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
|
((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue