From: Ilan Elias <ilane@ti.com>
Date: Sun, 8 Jan 2012 11:43:02 +0000 (+0200)
Subject: NFC: Increase NCI deactivate timeout
X-Git-Tag: firefly_0821_release~3680^2~3338^2~112^2~428
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=11ee51589a61fa836b1540293ad6c7dfd7de544a;p=firefly-linux-kernel-4.4.55.git

NFC: Increase NCI deactivate timeout

Increase NCI deactivate timeout from 5 sec to 30 sec.
NCI deactivate procedure might take a long time,
depending on the local and remote parameters.

Signed-off-by: Ilan Elias <ilane@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index bccd89e9d4c2..f4963ea77947 100644
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -47,7 +47,7 @@ enum {
 #define NCI_RESET_TIMEOUT			5000
 #define NCI_INIT_TIMEOUT			5000
 #define NCI_RF_DISC_TIMEOUT			5000
-#define NCI_RF_DEACTIVATE_TIMEOUT		5000
+#define NCI_RF_DEACTIVATE_TIMEOUT		30000
 #define NCI_CMD_TIMEOUT				5000
 
 struct nci_dev;