Merge branch 'linus' into tracing/mmiotrace

2 files changed, 11 insertions, 5 deletions

diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
index 75def13e797d..d28c53868093 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))) {
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 7cf8851286b5..d184f2aea78d 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1168,15 +1168,21 @@ EXPORT_SYMBOL(ssb_dma_translation);
 int ssb_dma_set_mask(struct ssb_device *ssb_dev, u64 mask)
 {
         struct device *dma_dev = ssb_dev->dma_dev;
+        int err = 0;
 
 #ifdef CONFIG_SSB_PCIHOST
-        if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI)
-                return dma_set_mask(dma_dev, mask);
+        if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI) {
+                err = pci_set_dma_mask(ssb_dev->bus->host_pci, mask);
+                if (err)
+                        return err;
+                err = pci_set_consistent_dma_mask(ssb_dev->bus->host_pci, mask);
+                return err;
+        }
 #endif
         dma_dev->coherent_dma_mask = mask;
         dma_dev->dma_mask = &dma_dev->coherent_dma_mask;
 
-        return 0;
+        return err;
 }
 EXPORT_SYMBOL(ssb_dma_set_mask);