diff --git a/[refs] b/[refs]
index 5dc9163d2915..4cf355a7d177 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32b083a3fd1452b9d5aba8e781ca95b566f3e054
+refs/heads/master: 0e7894dc82bd9d4d82c16d16189f58da6d41d018
diff --git a/trunk/drivers/misc/vmw_vmci/vmci_guest.c b/trunk/drivers/misc/vmw_vmci/vmci_guest.c
index d302c89d2bfa..d7df6cfed28a 100644
--- a/trunk/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/trunk/drivers/misc/vmw_vmci/vmci_guest.c
@@ -78,7 +78,7 @@ bool vmci_guest_code_active(void)
 u32 vmci_get_vm_context_id(void)
 {
 	if (vm_context_id == VMCI_INVALID_ID) {
-		u32 result;
+		int result;
 		struct vmci_datagram get_cid_msg;
 		get_cid_msg.dst =
 		    vmci_make_handle(VMCI_HYPERVISOR_CONTEXT_ID,