evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "icnss: Fix condition for trigger recovery"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-21 13:28:32 -07:00 • committed by Gerrit - the friendly Code Review server
commit 59d6094ffa
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/soc/qcom/icnss.c
View file

@ -2543,7 +2543,7 @@ static int icnss_pd_restart_enable(struct icnss_priv *priv)
return 0; return 0;
out: out:
icnss_pr_err("PD restart not enabled: %d\n", ret); icnss_pr_err("Failed to enable PD restart: %d\n", ret);
return ret; return ret;
} }
@ -3156,22 +3156,23 @@ int icnss_trigger_recovery(struct device *dev)
goto out; goto out;
} }
if (test_bit(ICNSS_PDR_ENABLED, &priv->state)) { if (!test_bit(ICNSS_PDR_ENABLED, &priv->state)) {
icnss_pr_err("PD restart not enabled: state: 0x%lx\n", icnss_pr_err("PD restart not enabled to trigger recovery: state: 0x%lx\n",
priv->state); priv->state);
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
goto out; goto out;
} }
if (!priv->service_notifier[0].handle) { if (!priv->service_notifier || !priv->service_notifier[0].handle) {
icnss_pr_err("Invalid handle during recovery, state: 0x%lx\n", icnss_pr_err("Invalid handle during recovery, state: 0x%lx\n",
priv->state); priv->state);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
icnss_pr_dbg("Initiate PD restart at WLAN FW, state: 0x%lx\n", WARN_ON(1);
priv->state); icnss_pr_warn("Initiate PD restart at WLAN FW, state: 0x%lx\n",
priv->state);
priv->stats.trigger_recovery++; priv->stats.trigger_recovery++;
/* /*
@ -3369,6 +3370,7 @@ static int icnss_fw_debug_show(struct seq_file *s, void *data)
seq_puts(s, " VAL: 0 (Test mode disable)\n"); seq_puts(s, " VAL: 0 (Test mode disable)\n");
seq_puts(s, " VAL: 1 (WLAN FW test)\n"); seq_puts(s, " VAL: 1 (WLAN FW test)\n");
seq_puts(s, " VAL: 2 (CCPM test)\n"); seq_puts(s, " VAL: 2 (CCPM test)\n");
seq_puts(s, " VAL: 3 (Trigger Recovery)\n");
seq_puts(s, "\nCMD: dynamic_feature_mask\n"); seq_puts(s, "\nCMD: dynamic_feature_mask\n");
seq_puts(s, " VAL: (64 bit feature mask)\n"); seq_puts(s, " VAL: (64 bit feature mask)\n");