diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-05-25 10:39:39 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-05-25 10:39:39 +0200 |
commit | 21c73367fc8f265657b24343497ed5135e296c24 (patch) | |
tree | be959b2ac685efc2c43b397f45ed556952fd0ff1 /drivers/base/dd.c | |
parent | c62ec4610c40bcc44f2d3d5ed1c312737279e2f3 (diff) | |
parent | 1d6442263400709f12586b4b23a75b6aad549140 (diff) | |
download | blackbird-obmc-linux-21c73367fc8f265657b24343497ed5135e296c24.tar.gz blackbird-obmc-linux-21c73367fc8f265657b24343497ed5135e296c24.zip |
Merge back PM core material for v4.18.
Diffstat (limited to 'drivers/base/dd.c')
-rw-r--r-- | drivers/base/dd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index c9f54089429b..10454fe54482 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -122,9 +122,7 @@ static void deferred_probe_work_func(struct work_struct *work) * the list is a good order for suspend but deferred * probe makes that very unsafe. */ - device_pm_lock(); - device_pm_move_last(dev); - device_pm_unlock(); + device_pm_move_to_tail(dev); dev_dbg(dev, "Retrying from deferred list\n"); if (initcall_debug && !initcalls_done) |