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

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

diff --git a/[refs] b/[refs]
index e5038e88f81b..461d5145ba6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e19c054434c7d3ad618129c2ff5c3d81efa6949
+refs/heads/master: 75910f236a30bded00f078cab994f35a7171c39b
diff --git a/trunk/drivers/staging/hv/ChannelMgmt.c b/trunk/drivers/staging/hv/ChannelMgmt.c
index 445506d45edb..05e6699e3c78 100644
--- a/trunk/drivers/staging/hv/ChannelMgmt.c
+++ b/trunk/drivers/staging/hv/ChannelMgmt.c
@@ -753,9 +753,15 @@ int VmbusChannelRequestOffers(void)
 	msgInfo = kmalloc(sizeof(*msgInfo) +
 			  sizeof(struct vmbus_channel_message_header),
 			  GFP_KERNEL);
-	ASSERT(msgInfo != NULL);
+	if (!msgInfo)
+		return -ENOMEM;
 
 	msgInfo->WaitEvent = osd_WaitEventCreate();
+	if (!msgInfo->WaitEvent) {
+		kfree(msgInfo);
+		return -ENOMEM;
+	}
+
 	msg = (struct vmbus_channel_message_header *)msgInfo->Msg;
 
 	msg->MessageType = ChannelMessageRequestOffers;