Merge "msm_serial_hs: Fix race between mod_timer and del_timer calls" (bcb96a65) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/tty/serial/msm_serial_hs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1849,7 +1849,7 @@ static void msm_hs_sps_tx_callback(struct sps_event_notify *notify)
		&addr, notify->data.transfer.iovec.size,
		notify->data.transfer.iovec.flags);

		del_timer(&msm_uport->tx.tx_timeout_timer);
		del_timer_sync(&msm_uport->tx.tx_timeout_timer);
		MSM_HS_DBG("%s(): Queue kthread work\n", __func__);
		kthread_queue_work(&msm_uport->tx.kworker, &msm_uport->tx.kwork);
		}