1 From bc26554ffa0223015edb474a4877ec544167dfba Mon Sep 17 00:00:00 2001
2 From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
3 Date: Tue, 25 Mar 2014 19:51:38 +0100
4 Subject: [PATCH 123/182] ata: ahci_platform: fix ahci_platform_data->suspend
7 Looking at ST SPEAr1340 AHCI code (the only user of the deprecated
8 pdata->suspend and pdata->resume) it is obvious the we should return
9 after calling pdata->suspend() only if the function have returned
10 non-zero return value. The code has been broken since commit 1e70c2
11 ("ata/ahci_platform: Add clock framework support"). Fix it.
13 Cc: Viresh Kumar <viresh.linux@gmail.com>
14 Cc: Shiraz Hashim <shiraz.hashim@st.com>
15 Acked-by: Hans de Goede <hdegoede@redhat.com>
16 Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
17 Signed-off-by: Tejun Heo <tj@kernel.org>
19 drivers/ata/ahci_platform.c | 11 +++++++++--
20 1 file changed, 9 insertions(+), 2 deletions(-)
22 --- a/drivers/ata/ahci_platform.c
23 +++ b/drivers/ata/ahci_platform.c
24 @@ -521,12 +521,19 @@ int ahci_platform_suspend(struct device
28 - if (pdata && pdata->suspend)
29 - return pdata->suspend(dev);
30 + if (pdata && pdata->suspend) {
31 + rc = pdata->suspend(dev);
36 ahci_platform_disable_resources(hpriv);
41 + ahci_platform_resume_host(dev);
44 EXPORT_SYMBOL_GPL(ahci_platform_suspend);