summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-12-15 13:47:58 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-15 13:47:58 -0500
commit42a3b63bb2ca4996a3d1210a004eae2333f1119e (patch)
treef61c88fb4483bf75f557105a889e256a4f325c0d /net
parent3f1e6d3fd37bd4f25e5b19f1c7ca21850426c33f (diff)
parent78feb35b8161acd95c33a703ed6ab6f554d29387 (diff)
downloadlinux-42a3b63bb2ca4996a3d1210a004eae2333f1119e.tar.gz
linux-42a3b63bb2ca4996a3d1210a004eae2333f1119e.tar.bz2
linux-42a3b63bb2ca4996a3d1210a004eae2333f1119e.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 3925c6578767..ea66034499ce 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;