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

Commit e2f6d5b0 authored by Pavel Skripkin's avatar Pavel Skripkin Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: get rid of flush_scheduled_work 



commit 9be550ee43919b070bcd77f9228bdbbbc073245b upstream.

This patch is preparation for following patch for error handling
refactoring.

flush_scheduled_work() takes (wq_completion)events lock and
it can lead to deadlock when r871xu_dev_remove() is called from workqueue.
To avoid deadlock sutiation we can change flush_scheduled_work() call to
flush_work() call for all possibly scheduled works in this driver,
since next patch adds device_release_driver() in case of fw load failure.

Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/6e028b4c457eeb7156c76c6ea3cdb3cb0207c7e1.1626895918.git.paskripkin@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f241df0

drivers/staging/rtl8712/rtl8712_led.c

+8 −0
Original line number Diff line number Diff line
@@ -1820,3 +1820,11 @@ void LedControl871x(struct _adapter *padapter, enum LED_CTL_MODE LedAction) 
		break;

	}

}



void r8712_flush_led_works(struct _adapter *padapter)

{

	struct led_priv *pledpriv = &padapter->ledpriv;



	flush_work(&pledpriv->SwLed0.BlinkWorkItem);

	flush_work(&pledpriv->SwLed1.BlinkWorkItem);

}

drivers/staging/rtl8712/rtl871x_led.h

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ struct led_priv { 
void r8712_InitSwLeds(struct _adapter *padapter);

void r8712_DeInitSwLeds(struct _adapter *padapter);

void LedControl871x(struct _adapter *padapter, enum LED_CTL_MODE LedAction);

void r8712_flush_led_works(struct _adapter *padapter);



#endif

drivers/staging/rtl8712/rtl871x_pwrctrl.c

+8 −0
Original line number Diff line number Diff line
@@ -224,3 +224,11 @@ void r8712_unregister_cmd_alive(struct _adapter *padapter) 
	}

	mutex_unlock(&pwrctrl->mutex_lock);

}



void r8712_flush_rwctrl_works(struct _adapter *padapter)

{

	struct pwrctrl_priv *pwrctrl = &padapter->pwrctrlpriv;



	flush_work(&pwrctrl->SetPSModeWorkItem);

	flush_work(&pwrctrl->rpwm_workitem);

}

drivers/staging/rtl8712/rtl871x_pwrctrl.h

+1 −0
Original line number Diff line number Diff line
@@ -111,5 +111,6 @@ void r8712_cpwm_int_hdl(struct _adapter *padapter, 
void r8712_set_ps_mode(struct _adapter *padapter, uint ps_mode,

			uint smart_ps);

void r8712_set_rpwm(struct _adapter *padapter, u8 val8);

void r8712_flush_rwctrl_works(struct _adapter *padapter);



#endif  /* __RTL871X_PWRCTRL_H_ */

drivers/staging/rtl8712/usb_intf.c

+2 −1
Original line number Diff line number Diff line
@@ -604,7 +604,8 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf) 
			padapter->surprise_removed = true;

		if (pnetdev->reg_state != NETREG_UNINITIALIZED)

			unregister_netdev(pnetdev); /* will call netdev_close() */

		flush_scheduled_work();

		r8712_flush_rwctrl_works(padapter);

		r8712_flush_led_works(padapter);

		udelay(1);

		/* Stop driver mlme relation timer */

		r8712_stop_drv_timers(padapter);