Merge "icnss: Avoid qmi exchange when fw is down" (80418e1d) · Commits · e / devices / android_kernel_sony_msm8998

drivers/soc/qcom/icnss.c

+13 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-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
		@@ -3073,6 +3073,12 @@ int icnss_set_fw_log_mode(struct device *dev, uint8_t fw_log_mode)
		if (!dev)
		return -ENODEV;

		if (test_bit(ICNSS_FW_DOWN, &penv->state)) {
		icnss_pr_err("FW down, ignoring fw_log_mode state: 0x%lx\n",
		penv->state);
		return -EINVAL;
		}

		icnss_pr_dbg("FW log mode: %u\n", fw_log_mode);

		ret = wlfw_ini_send_sync_msg(fw_log_mode);
		@@ -3166,6 +3172,12 @@ int icnss_wlan_enable(struct device dev, struct icnss_wlan_enable_cfg config,
		if (!dev)
		return -ENODEV;

		if (test_bit(ICNSS_FW_DOWN, &penv->state)) {
		icnss_pr_err("FW down, ignoring wlan_enable state: 0x%lx\n",
		penv->state);
		return -EINVAL;
		}

		icnss_pr_dbg("Mode: %d, config: %p, host_version: %s\n",
		mode, config, host_version);