Merge "icnss: Avoid qmi exchange when fw is not ready" (295a4e80) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/soc/qcom/icnss.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -3180,7 +3180,8 @@ 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)) {
		if (test_bit(ICNSS_FW_DOWN, &penv->state) \|\|
		!test_bit(ICNSS_FW_READY, &penv->state)) {
		icnss_pr_err("FW down, ignoring fw_log_mode state: 0x%lx\n",
		penv->state);
		return -EINVAL;
		@@ -3279,7 +3280,8 @@ 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)) {
		if (test_bit(ICNSS_FW_DOWN, &penv->state) \|\|
		!test_bit(ICNSS_FW_READY, &penv->state)) {
		icnss_pr_err("FW down, ignoring wlan_enable state: 0x%lx\n",
		penv->state);
		return -EINVAL;