1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index a633076e562..bf8bf79e6a1 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)
 {
         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);
+                pm_runtime_put_sync(dev->parent);
+        }
 
         if (err == 0) {
                 pm_runtime_disable(dev);