Re: [linux-next:master 408/8237] drivers/net/wireless/ath/ath11k/wow.c:712 ath11k_wow_op_resume() warn: inconsistent returns '&ar->conf_mutex'.

[Carl Huang <quic_cjhuang@xxxxxxxxxxx>]

Hi Kalle,

Is the below the same fix that you have already applied to ath.git?

[-next] ath11k: fix missing unlock on error in ath11k_wow_op_resume() - Patchwork (kernel.org)

Thanks,

Carl

On 5/5/2022 12:23 AM, Kalle Valo wrote:

> + ath11k, wen
>
> Dan Carpenter <dan.carpenter@xxxxxxxxxx> writes:
>
> > tree:   https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
> > head:   44a2f39e611ac0bc1f17c288a583d7f2e5684aa7
> > commit: 90bf5c8d0f7ecddf96fc1cd9434af4e157b51970 [408/8237] ath11k:
> > purge rx pktlog when entering WoW
> > config: i386-randconfig-m021-20220502
> > (https://download.01.org/0day-ci/archive/20220503/202205032236.kofEquX3-lkp@xxxxxxxxx/config)
> > compiler: gcc-11 (Debian 11.2.0-20) 11.2.0
> >
> > If you fix the issue, kindly add following tag as appropriate
> > Reported-by: kernel test robot <lkp@xxxxxxxxx>
> > Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> >
> > smatch warnings:
> > drivers/net/wireless/ath/ath11k/wow.c:712 ath11k_wow_op_resume() warn:
> > inconsistent returns '&ar->conf_mutex'.
> >
> > vim +712 drivers/net/wireless/ath/ath11k/wow.c
> >
> > ba9177fcef21fa Carl Huang 2022-03-14 653 int
> > ath11k_wow_op_resume(struct ieee80211_hw *hw)
> > ba9177fcef21fa Carl Huang 2022-03-14  654  {
> > ba9177fcef21fa Carl Huang 2022-03-14  655  	struct ath11k *ar = hw->priv;
> > ba9177fcef21fa Carl Huang 2022-03-14  656  	int ret;
> > ba9177fcef21fa Carl Huang 2022-03-14  657  
> > ba9177fcef21fa Carl Huang 2022-03-14  658  	mutex_lock(&ar->conf_mutex);
> > ba9177fcef21fa Carl Huang 2022-03-14  659  
> > ba9177fcef21fa Carl Huang 2022-03-14  660  	ret = ath11k_hif_resume(ar->ab);
> > ba9177fcef21fa Carl Huang 2022-03-14  661  	if (ret) {
> > ba9177fcef21fa Carl Huang 2022-03-14 662 ath11k_warn(ar->ab, "failed
> > to resume hif: %d\n", ret);
> > ba9177fcef21fa Carl Huang 2022-03-14  663  		goto exit;
> > ba9177fcef21fa Carl Huang 2022-03-14  664  	}
> > ba9177fcef21fa Carl Huang 2022-03-14  665  
> > ba9177fcef21fa Carl Huang 2022-03-14  666  	ath11k_hif_ce_irq_enable(ar->ab);
> > ba9177fcef21fa Carl Huang 2022-03-14  667  	ath11k_hif_irq_enable(ar->ab);
> > ba9177fcef21fa Carl Huang 2022-03-14  668  
> > 90bf5c8d0f7ecd Carl Huang 2022-03-14  669  	ret = ath11k_dp_rx_pktlog_start(ar->ab);
> > 90bf5c8d0f7ecd Carl Huang 2022-03-14  670  	if (ret) {
> > 90bf5c8d0f7ecd Carl Huang 2022-03-14 671 ath11k_warn(ar->ab, "failed
> > to start rx pktlog from wow: %d\n", ret);
> > 90bf5c8d0f7ecd Carl Huang 2022-03-14  672  		return ret;
> >
> > goto exit;
> >       
> Carl or Wen, are you able to send a fix for this?
>