1 files changed, 20 insertions, 7 deletions

diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 2cab3c0a6805..ddadd08956f4 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -144,6 +144,21 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dev_err(&pdev->dev, "failed to get pci regions.\n");
                 goto disable_device;
         }
+
+        if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) ||
+            dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+
+                err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+                if (err)
+                        err = dma_set_coherent_mask(&pdev->dev,
+                                                    DMA_BIT_MASK(32));
+        }
+        if (err) {
+                dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");
+                goto release_regions;
+        }
+
+
         /* allocates and initializes the mei dev structure */
         dev = mei_me_dev_init(pdev);
         if (!dev) {
@@ -197,8 +212,8 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         return 0;
 
 release_irq:
+        mei_cancel_work(dev);
         mei_disable_interrupts(dev);
-        flush_scheduled_work();
         free_irq(pdev->irq, dev);
 disable_msi:
         pci_disable_msi(pdev);
@@ -306,16 +321,14 @@ static int mei_me_pci_resume(struct device *device)
                 return err;
         }
 
-        mutex_lock(&dev->device_lock);
-        dev->dev_state = MEI_DEV_POWER_UP;
-        mei_clear_interrupts(dev);
-        mei_reset(dev, 1);
-        mutex_unlock(&dev->device_lock);
+        err = mei_restart(dev);
+        if (err)
+                return err;
 
         /* Start timer if stopped in suspend */
         schedule_delayed_work(&dev->timer_work, HZ);
 
-        return err;
+        return 0;
 }
 static SIMPLE_DEV_PM_OPS(mei_me_pm_ops, mei_me_pci_suspend, mei_me_pci_resume);
 #define MEI_ME_PM_OPS   (&mei_me_pm_ops)