summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-08-06 21:52:19 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-08-06 21:52:18 -0700
commit5e1e8026558e5e4dd27c39eb068091fcf54249cc (patch)
tree243381fb7112696c848fa937869a4f6e9c1f56df
parent11ee621aea156ba9e1854335b0708f42fca975c7 (diff)
parent03dc844d919bc30cf2a3d05fbeef3b8d57172e29 (diff)
Merge "cnss2: Skip PCIe link suspend if link has already been suspended"
-rw-r--r--drivers/net/wireless/cnss2/pci.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/cnss2/pci.c b/drivers/net/wireless/cnss2/pci.c
index 0f4ef3712dd7..33e9955533a4 100644
--- a/drivers/net/wireless/cnss2/pci.c
+++ b/drivers/net/wireless/cnss2/pci.c
@@ -131,6 +131,7 @@ int cnss_suspend_pci_link(struct cnss_pci_data *pci_priv)
cnss_pr_dbg("Suspending PCI link\n");
if (!pci_priv->pci_link_state) {
cnss_pr_info("PCI link is already suspended!\n");
+ ret = -EINVAL;
goto out;
}
@@ -393,8 +394,10 @@ static int cnss_qca6174_shutdown(struct cnss_pci_data *pci_priv)
cnss_pci_set_auto_suspended(pci_priv, 0);
ret = cnss_suspend_pci_link(pci_priv);
- if (ret)
+ if (ret) {
cnss_pr_err("Failed to suspend PCI link, err = %d\n", ret);
+ return -EINVAL;
+ }
cnss_power_off_device(plat_priv);