Merge "scsi: pm: Balance pm_only of request queue during system resume" (9cbbef04) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/scsi/scsi_pm.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -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,7 +97,9 @@ static int scsi_dev_type_resume(struct device *dev,
		*/
		if (!err && scsi_is_sdev_device(dev)) {
		struct scsi_device *sdev = to_scsi_device(dev);

		if (was_runtime_suspended)
		blk_post_runtime_resume(sdev->request_queue, 0);
		else
		blk_set_runtime_active(sdev->request_queue);
		}
		}