diff options
| author | Aaron Lu <aaron.lu@intel.com> | 2012-11-09 15:27:52 +0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-11-30 09:24:43 +0000 |
| commit | 63347905dbc105bf4921c5e24e128b5819b74c9f (patch) | |
| tree | dd95016c962f9612b9006c692d6f25f65206ceaf /drivers | |
| parent | a01475637c70a4a484dd315a90bf2df518f07705 (diff) | |
| download | linux-3.10-63347905dbc105bf4921c5e24e128b5819b74c9f.tar.gz linux-3.10-63347905dbc105bf4921c5e24e128b5819b74c9f.tar.bz2 linux-3.10-63347905dbc105bf4921c5e24e128b5819b74c9f.zip | |
[SCSI] Revert "[SCSI] scsi_pm: set device runtime state before parent suspended"
This reverts commit 33a2285d96b5e7b9500612ec623bf4313397bb53.
With commit 88d26136a256576e444db312179e17af6dd0ea87 (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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/scsi_pm.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index dc0ad85853e..d4201ded3b2 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -76,24 +76,23 @@ static int scsi_bus_resume_common(struct device *dev) { int err = 0; - /* - * 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)) + 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); err = scsi_dev_type_resume(dev); + pm_runtime_put_sync(dev->parent); + } + if (err == 0) { pm_runtime_disable(dev); pm_runtime_set_active(dev); pm_runtime_enable(dev); } - - pm_runtime_put_sync(dev->parent); - return err; } |