diff options
author | John Crispin <john@openwrt.org> | 2015-02-11 10:09:23 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2015-02-11 10:09:23 +0000 |
commit | 88ddb3746188037afd38d631f7a893587fa8bdf0 (patch) | |
tree | df4684db63441435126c4b6ff1fda4ce615e1ff0 /target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch | |
parent | ddcbef5766fa18f52e7a7d1928b25edc63e73937 (diff) | |
download | master-31e0f0ae-88ddb3746188037afd38d631f7a893587fa8bdf0.tar.gz master-31e0f0ae-88ddb3746188037afd38d631f7a893587fa8bdf0.tar.bz2 master-31e0f0ae-88ddb3746188037afd38d631f7a893587fa8bdf0.zip |
ipq806x: update target to v3.18
Patches in the ipq806x/patches folder were out of tree in v3.14. The
newest patch at the time was from June, so we can safely assume that
either the patches have been merged, or they have been rejected for
a good reason. If patches are seen missing, we'll cherry-pick them
on a per-needed basis.
This new kernel have been tested on AP148, which seems to works fine.
Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
SVN-Revision: 44386
Diffstat (limited to 'target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch')
-rw-r--r-- | target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch | 45 |
1 files changed, 0 insertions, 45 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 deleted file mode 100644 index 1a9e6d174c..0000000000 --- a/target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch +++ /dev/null @@ -1,45 +0,0 @@ -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); - |