From 72924a30c783af43326c930ba0dabb28be7c3402 Mon Sep 17 00:00:00 2001 From: Ilan Elias Date: Sun, 8 Jan 2012 13:43:02 +0200 Subject: [PATCH] --- yaml --- r: 289948 b: refs/heads/master c: 11ee51589a61fa836b1540293ad6c7dfd7de544a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/nfc/nci_core.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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;