[RFC v3 04/13] ahci-platform: Undo pdata->resume on resume failure
From: Hans de Goede <hidden>
Date: 2014-01-18 23:48:46
Also in:
linux-devicetree, linux-ide
Subsystem:
libata sata ahci platform devices support, libata subsystem (serial and parallel ata drivers), the rest · Maintainers:
Hans de Goede, Damien Le Moal, Niklas Cassel, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2014-01-19 · Re: [RFC v3 04/13] ahci-platform: Undo pdata->resume on resume failure · Hans de Goede <hidden>
- 2014-01-19 · Re: [RFC v3 04/13] ahci-platform: Undo pdata->resume on resume failure · Tejun Heo <hidden>
- 2014-01-19 · Re: [RFC v3 04/13] ahci-platform: Undo pdata->resume on resume failure · Hans de Goede <hidden>
- 2014-01-19 · Re: [RFC v3 04/13] ahci-platform: Undo pdata->resume on resume failure · Tejun Heo <hidden>
- 2014-01-19 · Re: [RFC v3 04/13] ahci-platform: Undo pdata->resume on resume failure · Hans de Goede <hidden>
When the ahci_resume fails the error handling code tries to undo all changes made, but it was not undoing the results of pdata->resume. Signed-off-by: Hans de Goede <redacted> --- drivers/ata/ahci_platform.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index dc1ef73..41720cb 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c@@ -307,7 +307,7 @@ static int ahci_resume(struct device *dev) if (dev->power.power_state.event == PM_EVENT_SUSPEND) { rc = ahci_reset_controller(host); if (rc) - goto disable_unprepare_clk; + goto pdata_suspend; ahci_init_controller(host); }
@@ -316,6 +316,9 @@ static int ahci_resume(struct device *dev) return 0; +pdata_suspend: + if (pdata && pdata->suspend) + pdata->suspend(dev); disable_unprepare_clk: if (!IS_ERR(hpriv->clk)) clk_disable_unprepare(hpriv->clk);
--
1.8.4.2