Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / misc / mei / pci-me.c

diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 71cea9b296b2f72c1763d335024ff24379e137b7..e85bb371c87db3f3a27f8fbaa6eb7a98ea905240 100644 (file)
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -91,6 +91,9 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
        {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)},
        {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)},
 
+       {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, mei_me_pch8_cfg)},
+       {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, mei_me_pch8_cfg)},
+
        /* required last entry */
        {0, }
 };
@@ -400,6 +403,9 @@ static int mei_me_pm_runtime_suspend(struct device *device)
 
        dev_dbg(&pdev->dev, "rpm: me: runtime suspend ret=%d\n", ret);
 
+       if (ret && ret != -EAGAIN)
+               schedule_work(&dev->reset_work);
+
        return ret;
 }
 
@@ -423,6 +429,9 @@ static int mei_me_pm_runtime_resume(struct device *device)
 
        dev_dbg(&pdev->dev, "rpm: me: runtime resume ret = %d\n", ret);
 
+       if (ret)
+               schedule_work(&dev->reset_work);
+
        return ret;
 }