From 27f1baf18dd1e0703d29f39617b5e08b18d9ef75 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 9 Dec 2011 09:35:39 +0300 Subject: [PATCH] --- yaml --- r: 276949 b: refs/heads/master c: f8c141c3e915e3a040d4c1badde28e23f8cbe255 h: refs/heads/master i: 276947: ec91dc2f9a3432cefa3bf84dfaf0c4bed65e0a0d v: v3 --- [refs] | 2 +- trunk/net/nfc/nci/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5a6b3f5cb1ad..190ad6835bc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 123877b80ed62c3b897c53357b622574c023b642 +refs/heads/master: f8c141c3e915e3a040d4c1badde28e23f8cbe255 diff --git a/trunk/net/nfc/nci/core.c b/trunk/net/nfc/nci/core.c index 4047e29acb3b..25dae3f8f5c2 100644 --- a/trunk/net/nfc/nci/core.c +++ b/trunk/net/nfc/nci/core.c @@ -68,7 +68,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;