1 files changed, 50 insertions, 0 deletions
diff --git a/target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch b/target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch
new file mode 100644
index 0000000000..ce1d840b90
--- /dev/null
+++ b/target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch
@@ -0,0 +1,50 @@
+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(-)
+
+diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
+index 70fbf66..7bd6adf 100644
+--- a/drivers/ata/ahci_platform.c
++++ b/drivers/ata/ahci_platform.c
+@@ -521,12 +521,19 @@ int ahci_platform_suspend(struct device *dev)
+ 	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);
+ 
+-- 
+1.7.10.4
+