Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97780956 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Wait for RDDM if device is already in bad state"

parents 6d38e358 9e973e9f

drivers/net/wireless/cnss2/main.c

+5 −4
Original line number Diff line number Diff line
@@ -1321,13 +1321,13 @@ int cnss_force_collect_rddm(struct device *dev) 
	}



	if (cnss_bus_is_device_down(plat_priv)) {

		cnss_pr_info("Device is already in bad state, ignore force collect rddm\n");

		return 0;

		cnss_pr_info("Device is already in bad state, wait to collect rddm\n");

		goto wait_rddm;

	}



	if (test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state)) {

		cnss_pr_info("Recovery is already in progress, ignore forced collect rddm\n");

		return 0;

		cnss_pr_info("Recovery is already in progress, wait to collect rddm\n");

		goto wait_rddm;

	}



	if (test_bit(CNSS_DRIVER_LOADING, &plat_priv->driver_state) ||
@@ -1342,6 +1342,7 @@ int cnss_force_collect_rddm(struct device *dev) 
	if (ret)

		return ret;



wait_rddm:

	reinit_completion(&plat_priv->rddm_complete);

	ret = wait_for_completion_timeout

		(&plat_priv->rddm_complete,