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

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

Merge "cnss2: Add check to avoid unbalanced power set"

parents 27f048f1 8569d1a3

drivers/net/wireless/cnss2/main.h

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ struct cnss_plat_data { 
	u32 diag_reg_read_len;

	u8 *diag_reg_read_buf;

	bool cal_done;

	bool powered_on;

	char firmware_name[13];

};

drivers/net/wireless/cnss2/power.c

+12 −0
Original line number Diff line number Diff line
@@ -346,6 +346,11 @@ int cnss_power_on_device(struct cnss_plat_data *plat_priv) 
{

	int ret = 0;



	if (plat_priv->powered_on) {

		cnss_pr_dbg("Already powered up");

		return 0;

	}



	ret = cnss_vreg_on(plat_priv);

	if (ret) {

		cnss_pr_err("Failed to turn on vreg, err = %d\n", ret);
@@ -357,6 +362,7 @@ int cnss_power_on_device(struct cnss_plat_data *plat_priv) 
		cnss_pr_err("Failed to select pinctrl state, err = %d\n", ret);

		goto vreg_off;

	}

	plat_priv->powered_on = true;



	return 0;

vreg_off:
@@ -367,8 +373,14 @@ int cnss_power_on_device(struct cnss_plat_data *plat_priv) 


void cnss_power_off_device(struct cnss_plat_data *plat_priv)

{

	if (!plat_priv->powered_on) {

		cnss_pr_dbg("Already powered down");

		return;

	}



	cnss_select_pinctrl_state(plat_priv, false);

	cnss_vreg_off(plat_priv);

	plat_priv->powered_on = false;

}



void cnss_set_pin_connect_status(struct cnss_plat_data *plat_priv)