Skip to content

Commit

Permalink
[SCSI] Revert "[SCSI] runtime resume parent for child's system-resume"
Browse files Browse the repository at this point in the history
This reverts commit 28fd00d.

With commit 88d2613 (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>
  • Loading branch information
Aaron Lu authored and James Bottomley committed Nov 30, 2012
1 parent 6334790 commit 9c31d8e
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions drivers/scsi/scsi_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 9c31d8e

Please sign in to comment.