---

yaml --- r: 355011 b: refs/heads/master c: 32b083a h: refs/heads/master i: 355009: fc95507 355007: 7a33d2e v: v3
git-mirror · Jan 17, 2013 · e28ad76 · e28ad76
1 parent b05412b
commit e28ad76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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,