target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch

   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
   5  method handling
   6
   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.
  12
  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>
  18 ---
  19  drivers/ata/ahci_platform.c |   11 +++++++++--
  20  1 file changed, 9 insertions(+), 2 deletions(-)
  21
  22 diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
  23 index 70fbf66..7bd6adf 100644
  24 --- a/drivers/ata/ahci_platform.c
  25 +++ b/drivers/ata/ahci_platform.c
  26 @@ -521,12 +521,19 @@ int ahci_platform_suspend(struct device *dev)
  27         if (rc)
  28                 return rc;
  29
  30 -       if (pdata && pdata->suspend)
  31 -               return pdata->suspend(dev);
  32 +       if (pdata && pdata->suspend) {
  33 +               rc = pdata->suspend(dev);
  34 +               if (rc)
  35 +                       goto resume_host;
  36 +       }
  37
  38         ahci_platform_disable_resources(hpriv);
  39
  40         return 0;
  41 +
  42 +resume_host:
  43 +       ahci_platform_resume_host(dev);
  44 +       return rc;
  45  }
  46  EXPORT_SYMBOL_GPL(ahci_platform_suspend);
  47
  48 --
  49 1.7.10.4
  50