diff options
-rw-r--r-- | drivers/scsi/scsi_pm.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index a633076e5622..bf8bf79e6a1f 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c | |||
@@ -72,8 +72,17 @@ static int scsi_bus_resume_common(struct device *dev) | |||
72 | { | 72 | { |
73 | int err = 0; | 73 | int err = 0; |
74 | 74 | ||
75 | if (scsi_is_sdev_device(dev)) | 75 | if (scsi_is_sdev_device(dev)) { |
76 | /* | ||
77 | * Parent device may have runtime suspended as soon as | ||
78 | * it is woken up during the system resume. | ||
79 | * | ||
80 | * Resume it on behalf of child. | ||
81 | */ | ||
82 | pm_runtime_get_sync(dev->parent); | ||
76 | err = scsi_dev_type_resume(dev); | 83 | err = scsi_dev_type_resume(dev); |
84 | pm_runtime_put_sync(dev->parent); | ||
85 | } | ||
77 | 86 | ||
78 | if (err == 0) { | 87 | if (err == 0) { |
79 | pm_runtime_disable(dev); | 88 | pm_runtime_disable(dev); |