Commit fa9be5f0 authored Dec 23, 2013 by Amitkumar Karwar Committed by Samuel Ortiz Jan 05, 2014

NFC: NCI: Cancel cmd_timer in nci_close_device()



nci_close_device() sends nci reset command to the device.
If there is no response for this command, nci request timeout
occurs first and then cmd timeout happens. Because command
timer has started after sending the command.

We are immediately flushing command workqueue after nci
timeout. Later we will try to schedule cmd_work in command
timer which leads to a crash.

Cancel cmd_timer before flushing the workqueue to fix the
problem.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent c36aeba8

net/nfc/nci/core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -361,6 +361,8 @@ static int nci_close_device(struct nci_dev *ndev)
		msecs_to_jiffies(NCI_RESET_TIMEOUT));
		clear_bit(NCI_INIT, &ndev->flags);

		del_timer_sync(&ndev->cmd_timer);

		/* Flush cmd wq */
		flush_workqueue(ndev->cmd_wq);

Admin message