[SCSI] Revert "[SCSI] runtime resume parent for child's system-resume"
This reverts commit28fd00d42c
. With commit88d26136a2
(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:
parent
63347905db
commit
9c31d8e131
|
@ -76,17 +76,8 @@ static int scsi_bus_resume_common(struct device *dev)
|
||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
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);
|
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);
|
||||||
|
|
Loading…
Reference in a new issue