From e28ad7629e8d35ba279ffccee2efd7a7e9f247a0 Mon Sep 17 00:00:00 2001 From: Andy King Date: Thu, 10 Jan 2013 15:41:40 -0800 Subject: [PATCH] --- yaml --- r: 355011 b: refs/heads/master c: 32b083a3fd1452b9d5aba8e781ca95b566f3e054 h: refs/heads/master i: 355009: fc95507ac176d5058ccc274ad8b680645573f71b 355007: 7a33d2ec4507d5a17356b50777908dab98e5b661 v: v3 --- [refs] | 2 +- trunk/drivers/misc/vmw_vmci/vmci_queue_pair.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4f8ae6a4ee79..5dc9163d2915 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42281d20cdf94a9d2aae67ee019f8bcc390ebed6 +refs/heads/master: 32b083a3fd1452b9d5aba8e781ca95b566f3e054 diff --git a/trunk/drivers/misc/vmw_vmci/vmci_queue_pair.c b/trunk/drivers/misc/vmw_vmci/vmci_queue_pair.c index da47e457e158..6417a26df8d8 100644 --- a/trunk/drivers/misc/vmw_vmci/vmci_queue_pair.c +++ b/trunk/drivers/misc/vmw_vmci/vmci_queue_pair.c @@ -3355,11 +3355,11 @@ ssize_t vmci_qpair_dequev(struct vmci_qp *qpair, { ssize_t result; - qp_lock(qpair); - if (!qpair || !iov) return VMCI_ERROR_INVALID_ARGS; + qp_lock(qpair); + do { result = qp_dequeue_locked(qpair->produce_q, qpair->consume_q,