diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-14 14:35:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-14 14:35:41 -0500 |
| commit | 5d22df200beccb1dea26fe4d8684ed93ae2f0aeb (patch) | |
| tree | 05220b08a0c9d170ad88e3b9ed0390750d22d8ea /net/nfc | |
| parent | 8b1fdb53075bd794a209a611bc94aedaf7ecf9e2 (diff) | |
| parent | 78feb35b8161acd95c33a703ed6ab6f554d29387 (diff) | |
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')
| -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 37de28e97330..c55f233a5e2c 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, | |||
| 71 | __u32 timeout) | 71 | __u32 timeout) |
| 72 | { | 72 | { |
| 73 | int rc = 0; | 73 | int rc = 0; |
| 74 | unsigned long completion_rc; | 74 | long completion_rc; |
| 75 | 75 | ||
| 76 | ndev->req_status = NCI_REQ_PEND; | 76 | ndev->req_status = NCI_REQ_PEND; |
| 77 | 77 | ||