Commit 9c31d8e1 authored Nov 09, 2012 by Aaron Lu Committed by James Bottomley Nov 30, 2012

[SCSI] Revert "[SCSI] runtime resume parent for child's system-resume"



This reverts commit 28fd00d4.

With commit 88d26136 (PM: Prevent
runtime suspend during system resume), this patch is no longer needed.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 63347905

drivers/scsi/scsi_pm.c

+1 −10

Original line number	Diff line number	Diff line
		@@ -76,17 +76,8 @@ static int scsi_bus_resume_common(struct device *dev)
		{
		int err = 0;

		if (scsi_is_sdev_device(dev)) {
		/*
		* Parent device may have runtime suspended as soon as
		* it is woken up during the system resume.
		*
		* Resume it on behalf of child.
		*/
		pm_runtime_get_sync(dev->parent);
		if (scsi_is_sdev_device(dev))
		err = scsi_dev_type_resume(dev);
		pm_runtime_put_sync(dev->parent);
		}

		if (err == 0) {
		pm_runtime_disable(dev);