From d7c5c1a8e7e243cbdc7f389167bc0b668eb0bbb8 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Wed, 5 May 2010 15:27:32 -0400
Subject: [PATCH] --- yaml --- r: 197290 b: refs/heads/master c:
 8cad0af9a1a1882cd00f12f8f7c79690f563b1d7 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/hv/Connection.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b4ae2cf2b595..65ec1da0b45c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e052d98f2bbcaaaa6d509081d78e600927cfe60
+refs/heads/master: 8cad0af9a1a1882cd00f12f8f7c79690f563b1d7
diff --git a/trunk/drivers/staging/hv/Connection.c b/trunk/drivers/staging/hv/Connection.c
index dbf00560e0ac..1e4111412ab6 100644
--- a/trunk/drivers/staging/hv/Connection.c
+++ b/trunk/drivers/staging/hv/Connection.c
@@ -93,7 +93,7 @@ int VmbusConnect(void)
 			  sizeof(struct vmbus_channel_initiate_contact),
 			  GFP_KERNEL);
 	if (msgInfo == NULL) {
-		ret = -1;
+		ret = -ENOMEM;
 		goto Cleanup;
 	}
 
@@ -195,6 +195,8 @@ int VmbusDisconnect(void)
 		return -1;
 
 	msg = kzalloc(sizeof(struct vmbus_channel_message_header), GFP_KERNEL);
+	if (!msg)
+		return -ENOMEM;
 
 	msg->MessageType = ChannelMessageUnload;