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>
This commit is contained in:
Родитель
0dd5d6f0e8
Коммит
83b03fd67b
|
@ -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);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче