diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-19 08:26:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-19 08:26:39 +0100 |
| commit | d1388dacbbb1d1b2bc208a4ba18de9316dc49ce9 (patch) | |
| tree | 81dce4f9269bf8948bb2c6faae3635cc28753190 /net | |
| parent | Revert "drm/i915: fix infinite recursion on unbind due to ilk vt-d w/a" (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-d1388dacbbb1d1b2bc208a4ba18de9316dc49ce9.tar.xz linux-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.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; |