summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-12-19 02:26:39 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-19 02:26:39 -0500
commitd1388dacbbb1d1b2bc208a4ba18de9316dc49ce9 (patch)
tree81dce4f9269bf8948bb2c6faae3635cc28753190 /net
parented4a51842a9d9e618d4f4c31349b15b974dba5df (diff)
parent42a3b63bb2ca4996a3d1210a004eae2333f1119e (diff)
downloadlinux-3.10-d1388dacbbb1d1b2bc208a4ba18de9316dc49ce9.tar.gz
linux-3.10-d1388dacbbb1d1b2bc208a4ba18de9316dc49ce9.tar.bz2
linux-3.10-d1388dacbbb1d1b2bc208a4ba18de9316dc49ce9.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net')
-rw-r--r--net/nfc/nci/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 3925c657876..ea66034499c 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -69,7 +69,7 @@ static int __nci_request(struct nci_dev *ndev,
__u32 timeout)
{
int rc = 0;
- unsigned long completion_rc;
+ long completion_rc;
ndev->req_status = NCI_REQ_PEND;