summaryrefslogtreecommitdiff
path: root/net/nfc/nci
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-12-14 14:35:41 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-14 14:35:41 -0500
commit5d22df200beccb1dea26fe4d8684ed93ae2f0aeb (patch)
tree05220b08a0c9d170ad88e3b9ed0390750d22d8ea /net/nfc/nci
parent8b1fdb53075bd794a209a611bc94aedaf7ecf9e2 (diff)
parent78feb35b8161acd95c33a703ed6ab6f554d29387 (diff)
downloadlinux-3.10-5d22df200beccb1dea26fe4d8684ed93ae2f0aeb.tar.gz
linux-3.10-5d22df200beccb1dea26fe4d8684ed93ae2f0aeb.tar.bz2
linux-3.10-5d22df200beccb1dea26fe4d8684ed93ae2f0aeb.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'net/nfc/nci')
-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 37de28e9733..c55f233a5e2 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -71,7 +71,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;