iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] Revert "[SCSI] scsi_pm: set device runtime state before parent suspended"

Browse Source 
This reverts commit 33a2285d96.

With commit 88d26136a2 (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>
This commit is contained in:
Aaron Lu
2012-11-09 15:27:52 +08:00
committed by James Bottomley
parent a01475637c
commit 63347905db
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/scsi_pm.c
View File

@ -76,6 +76,7 @@ static int scsi_bus_resume_common(struct device *dev)
{ {
int err = 0; int err = 0;
if (scsi_is_sdev_device(dev)) {
/* /*
* Parent device may have runtime suspended as soon as * Parent device may have runtime suspended as soon as
* it is woken up during the system resume. * it is woken up during the system resume.
@ -83,17 +84,15 @@ static int scsi_bus_resume_common(struct device *dev)
* Resume it on behalf of child. * Resume it on behalf of child.
*/ */
pm_runtime_get_sync(dev->parent); pm_runtime_get_sync(dev->parent);
if (scsi_is_sdev_device(dev))
err = scsi_dev_type_resume(dev); err = scsi_dev_type_resume(dev);
pm_runtime_put_sync(dev->parent);
}
if (err == 0) { if (err == 0) {
pm_runtime_disable(dev); pm_runtime_disable(dev);
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
pm_runtime_enable(dev); pm_runtime_enable(dev);
} }
pm_runtime_put_sync(dev->parent);
return err; return err;
} }