diff --git a/[refs] b/[refs]
index f0dff3ce238e..b634e979f3a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd7e01bc7e7a90b33470173618f6f6805143cd42
+refs/heads/master: 11ee51589a61fa836b1540293ad6c7dfd7de544a
diff --git a/trunk/include/net/nfc/nci_core.h b/trunk/include/net/nfc/nci_core.h
index bccd89e9d4c2..f4963ea77947 100644
--- a/trunk/include/net/nfc/nci_core.h
+++ b/trunk/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;