From 38d2592b45cb22e5d0ab29b4fb59b90d1081d66a Mon Sep 17 00:00:00 2001
From: Aaron Lu <aaron.lu@intel.com>
Date: Fri, 9 Nov 2012 15:27:53 +0800
Subject: [PATCH] --- yaml --- r: 343734 b: refs/heads/master c:
 9c31d8e1319e0d3f85673c7119a10700bf03f77a h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/scsi/scsi_pm.c | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 6fd75cf41bbd..50b1cbedb2f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63347905dbc105bf4921c5e24e128b5819b74c9f
+refs/heads/master: 9c31d8e1319e0d3f85673c7119a10700bf03f77a
diff --git a/trunk/drivers/scsi/scsi_pm.c b/trunk/drivers/scsi/scsi_pm.c
index d4201ded3b22..9923b262263d 100644
--- a/trunk/drivers/scsi/scsi_pm.c
+++ b/trunk/drivers/scsi/scsi_pm.c
@@ -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);