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

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

Merge "icnss: reject idle restart if wlan driver unregistered"

parents ec02502f 60ae254b

drivers/soc/qcom/icnss.c

+12 −0
Original line number Diff line number Diff line
@@ -1536,6 +1536,12 @@ static int icnss_driver_event_idle_restart(void *data) 
	if (!penv->ops || !penv->ops->idle_restart)

		return 0;



	if (!test_bit(ICNSS_DRIVER_PROBED, &penv->state) ||

	    test_bit(ICNSS_DRIVER_UNLOADING, &penv->state)) {

		icnss_pr_err("Driver unloaded or unloading is in progress, so reject idle restart");

		return -EINVAL;

	}



	if (penv->is_ssr || test_bit(ICNSS_PDR, &penv->state) ||

	    test_bit(ICNSS_REJUVENATE, &penv->state)) {

		icnss_pr_err("SSR/PDR is already in-progress during idle restart callback\n");
@@ -2621,6 +2627,12 @@ int icnss_idle_restart(struct device *dev) 
		return -EINVAL;

	}



	if (!test_bit(ICNSS_DRIVER_PROBED, &penv->state) ||

	    test_bit(ICNSS_DRIVER_UNLOADING, &penv->state)) {

		icnss_pr_err("Driver unloaded or unloading is in progress, so reject idle restart");

		return -EINVAL;

	}



	if (priv->is_ssr || test_bit(ICNSS_PDR, &priv->state) ||

	    test_bit(ICNSS_REJUVENATE, &penv->state)) {

		icnss_pr_err("SSR/PDR is already in-progress during idle restart\n");