diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2018-01-09 15:40:11 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-01-09 15:40:11 -0800 |
| commit | 14aa89ff454c38da53994c46cae4d69371fe6470 (patch) | |
| tree | c77f05d2adc3cea0401c319591ef8898dfe1eef2 | |
| parent | fa18c55b4ddaad514f67fbac79fccc85c3c73df0 (diff) | |
| parent | fcc777aeeb63bfbc4799125513008aebb74f59e9 (diff) | |
Merge "cnss2: Ignore recovery if driver state is not proper"
| -rw-r--r-- | drivers/net/wireless/cnss2/main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/cnss2/main.c b/drivers/net/wireless/cnss2/main.c index 4d8ad7c8975f..5b218edad138 100644 --- a/drivers/net/wireless/cnss2/main.c +++ b/drivers/net/wireless/cnss2/main.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1508,8 +1508,14 @@ static int cnss_driver_recovery_hdlr(struct cnss_plat_data *plat_priv, cnss_recovery_reason_to_str(recovery_data->reason), recovery_data->reason); + if (!plat_priv->driver_state) { + cnss_pr_err("Improper driver state, ignore recovery\n"); + ret = -EINVAL; + goto out; + } + if (test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state)) { - cnss_pr_err("Recovery is already in progress!\n"); + cnss_pr_err("Recovery is already in progress\n"); ret = -EINVAL; goto out; } |