diff options
| author | John W. Linville | 2011-12-15 19:47:58 +0100 |
|---|---|---|
| committer | John W. Linville | 2011-12-15 19:47:58 +0100 |
| commit | 42a3b63bb2ca4996a3d1210a004eae2333f1119e (patch) | |
| tree | f61c88fb4483bf75f557105a889e256a4f325c0d /net | |
| parent | sch_gred: should not use GFP_KERNEL while holding a spinlock (diff) | |
| parent | iwlwifi: allow to switch to HT40 if not associated (diff) | |
| download | kernel-qcow2-linux-42a3b63bb2ca4996a3d1210a004eae2333f1119e.tar.gz kernel-qcow2-linux-42a3b63bb2ca4996a3d1210a004eae2333f1119e.tar.xz kernel-qcow2-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.c | 2 |
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; |