summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-12-09 09:35:39 +0300
committerJohn W. Linville <linville@tuxdriver.com>2011-12-12 14:23:27 -0500
commitf8c141c3e915e3a040d4c1badde28e23f8cbe255 (patch)
treed2b8b3f0530f284fb14e636199decbd3f9105c2a /net
parent123877b80ed62c3b897c53357b622574c023b642 (diff)
downloadlinux-f8c141c3e915e3a040d4c1badde28e23f8cbe255.tar.bz2
nfc: signedness bug in __nci_request()
wait_for_completion_interruptible_timeout() returns -ERESTARTSYS if interrupted so completion_rc needs to be signed. The current code probably returns -ETIMEDOUT if we hit this situation, but after this patch is applied it will return -ERESTARTSYS. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/nfc/nci/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 4047e29acb3b..25dae3f8f5c2 100644
--- a/net/nfc/nci/core.c
+++ b/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;