diff options
| author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2017-12-19 12:44:56 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-24 09:34:12 +0200 |
| commit | c9bb6fb2df18eda60e8dc125232338a76ffb7163 (patch) | |
| tree | 01692e3a9c85f1fa70b1fd57b988dddc76414137 /drivers/thunderbolt | |
| parent | 2e9feaf9feb84ab387ee10d8ced7d77b745b25d9 (diff) | |
| download | linux-stable-c9bb6fb2df18eda60e8dc125232338a76ffb7163.tar.gz linux-stable-c9bb6fb2df18eda60e8dc125232338a76ffb7163.tar.bz2 linux-stable-c9bb6fb2df18eda60e8dc125232338a76ffb7163.zip | |
thunderbolt: Resume control channel after hibernation image is created
commit f2a659f7d8d5da803836583aa16df06bdf324252 upstream.
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/thunderbolt')
| -rw-r--r-- | drivers/thunderbolt/nhi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c index a8c20413dbda..cba6bc6ab9ed 100644 --- a/drivers/thunderbolt/nhi.c +++ b/drivers/thunderbolt/nhi.c @@ -628,6 +628,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, }; |