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

Commit 7160c694 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Greg Kroah-Hartman
Browse files

wifi: rtw88: mac: Return the original error from rtw_mac_power_switch() 



[ Upstream commit 15c8e267dfa62f207ee1db666c822324e3362b84 ]

rtw_mac_power_switch() calls rtw_pwr_seq_parser() which can return
-EINVAL, -EBUSY or 0. Propagate the original error code instead of
unconditionally returning -EINVAL in case of an error.

Fixes: e3037485 ("rtw88: new Realtek 802.11ac driver")
Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230226221004.138331-3-martin.blumenstingl@googlemail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 743ae09b

drivers/net/wireless/realtek/rtw88/mac.c

+4 −2
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on) 
	struct rtw_pwr_seq_cmd **pwr_seq;

	u8 rpwm;

	bool cur_pwr;

	int ret;



	rpwm = rtw_read8(rtwdev, rtwdev->hci.rpwm_addr);
@@ -245,8 +246,9 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on) 
		return -EALREADY;



	pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq;

	if (rtw_pwr_seq_parser(rtwdev, pwr_seq))

		return -EINVAL;

	ret = rtw_pwr_seq_parser(rtwdev, pwr_seq);

	if (ret)

		return ret;



	return 0;

}