mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 05:39:54 -04:00
Merge "scsi: pm: Balance pm_only of request queue during system resume"
This commit is contained in:
commit
9cbbef041c
1 changed files with 8 additions and 2 deletions
|
|
@ -80,6 +80,10 @@ static int scsi_dev_type_resume(struct device *dev,
|
|||
dev_dbg(dev, "scsi resume: %d\n", err);
|
||||
|
||||
if (err == 0) {
|
||||
bool was_runtime_suspended;
|
||||
|
||||
was_runtime_suspended = pm_runtime_suspended(dev);
|
||||
|
||||
pm_runtime_disable(dev);
|
||||
err = pm_runtime_set_active(dev);
|
||||
pm_runtime_enable(dev);
|
||||
|
|
@ -93,8 +97,10 @@ static int scsi_dev_type_resume(struct device *dev,
|
|||
*/
|
||||
if (!err && scsi_is_sdev_device(dev)) {
|
||||
struct scsi_device *sdev = to_scsi_device(dev);
|
||||
|
||||
blk_set_runtime_active(sdev->request_queue);
|
||||
if (was_runtime_suspended)
|
||||
blk_post_runtime_resume(sdev->request_queue, 0);
|
||||
else
|
||||
blk_set_runtime_active(sdev->request_queue);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue