diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-04 14:58:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-04 14:58:13 -0700 |
| commit | b4496d44c6bd8b2da8d370ef49c4b008ce82370b (patch) | |
| tree | 8b0ef5c9fd850dab06313b8fb7bb916fb903dae8 /drivers/ssb/driver_pcicore.c | |
| parent | b9031d9d87b24e24cd32ea15b5f4220a1e8da909 (diff) | |
| parent | 4546002c813568829b70d00fab752de3999c3f1a (diff) | |
| download | kernel_samsung_crespo-b4496d44c6bd8b2da8d370ef49c4b008ce82370b.zip kernel_samsung_crespo-b4496d44c6bd8b2da8d370ef49c4b008ce82370b.tar.gz kernel_samsung_crespo-b4496d44c6bd8b2da8d370ef49c4b008ce82370b.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/ssb/driver_pcicore.c')
| -rw-r--r-- | drivers/ssb/driver_pcicore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c index 75def13..d28c538 100644 --- a/drivers/ssb/driver_pcicore.c +++ b/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))) { |