summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2017-12-19 10:44:56 +0100
committerMika Westerberg <mika.westerberg@linux.intel.com>2018-03-09 10:54:09 +0100
commitf2a659f7d8d5da803836583aa16df06bdf324252 (patch)
treec759f5e7acc8da524d0a5e5b9922cbab41fc0bc0
parentLinux 4.16-rc4 (diff)
downloadlinux-f2a659f7d8d5da803836583aa16df06bdf324252.tar.xz
linux-f2a659f7d8d5da803836583aa16df06bdf324252.zip
thunderbolt: Resume control channel after hibernation image is created
The driver misses implementation of PM hook that undoes what ->freeze_noirq() does after the hibernation image is created. This means the control channel is not resumed properly and the Thunderbolt bus becomes useless in later stages of hibernation (when the image is stored or if the operation fails). Fix this by pointing ->thaw_noirq to driver nhi_resume_noirq(). This makes sure the control channel is resumed properly. Fixes: 23dd5bb49d98 ("thunderbolt: Add suspend/hibernate support") Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: stable@vger.kernel.org
-rw-r--r--drivers/thunderbolt/nhi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index f45bcbc63738..80c33c7404f5 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -1064,6 +1064,7 @@ static const struct dev_pm_ops nhi_pm_ops = {
* we just disable hotplug, the
* pci-tunnels stay alive.
*/
+ .thaw_noirq = nhi_resume_noirq,
.restore_noirq = nhi_resume_noirq,
.suspend = nhi_suspend,
.freeze = nhi_suspend,