02629d8f87
Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 42463
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From bc26554ffa0223015edb474a4877ec544167dfba Mon Sep 17 00:00:00 2001
|
|
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
|
|
Date: Tue, 25 Mar 2014 19:51:38 +0100
|
|
Subject: [PATCH 123/182] ata: ahci_platform: fix ahci_platform_data->suspend
|
|
method handling
|
|
|
|
Looking at ST SPEAr1340 AHCI code (the only user of the deprecated
|
|
pdata->suspend and pdata->resume) it is obvious the we should return
|
|
after calling pdata->suspend() only if the function have returned
|
|
non-zero return value. The code has been broken since commit 1e70c2
|
|
("ata/ahci_platform: Add clock framework support"). Fix it.
|
|
|
|
Cc: Viresh Kumar <viresh.linux@gmail.com>
|
|
Cc: Shiraz Hashim <shiraz.hashim@st.com>
|
|
Acked-by: Hans de Goede <hdegoede@redhat.com>
|
|
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
|
|
Signed-off-by: Tejun Heo <tj@kernel.org>
|
|
---
|
|
drivers/ata/ahci_platform.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/ata/ahci_platform.c
|
|
+++ b/drivers/ata/ahci_platform.c
|
|
@@ -521,12 +521,19 @@ int ahci_platform_suspend(struct device
|
|
if (rc)
|
|
return rc;
|
|
|
|
- if (pdata && pdata->suspend)
|
|
- return pdata->suspend(dev);
|
|
+ if (pdata && pdata->suspend) {
|
|
+ rc = pdata->suspend(dev);
|
|
+ if (rc)
|
|
+ goto resume_host;
|
|
+ }
|
|
|
|
ahci_platform_disable_resources(hpriv);
|
|
|
|
return 0;
|
|
+
|
|
+resume_host:
|
|
+ ahci_platform_resume_host(dev);
|
|
+ return rc;
|
|
}
|
|
EXPORT_SYMBOL_GPL(ahci_platform_suspend);
|
|
|