git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
net
/
nfc
/
nci
/
core.c
diff --git
a/net/nfc/nci/core.c
b/net/nfc/nci/core.c
index
3925c65
..
ea66034
100644
(file)
--- 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;