From 9f6171640a9fc2b1daf79f51c0aa5dd75d993e48 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Mon, 6 Jun 2011 15:49:59 -0700
Subject: [PATCH] --- yaml --- r: 259467 b: refs/heads/master c:
 e9a27a9f9ef18826030f6d50efde0dc68b7d1be2 h: refs/heads/master i:   259465:
 75f906956d4e2ff493a920d7efcbaf2df70cb61d   259463:
 a7a273865040362003a5e000bb5b5adbe6fcc7c0 v: v3

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

diff --git a/[refs] b/[refs]
index fba21d7c02da..829838bb2007 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9f1db832b6d04303f443a7f941367355844678a
+refs/heads/master: e9a27a9f9ef18826030f6d50efde0dc68b7d1be2
diff --git a/trunk/drivers/staging/hv/channel.c b/trunk/drivers/staging/hv/channel.c
index 043fe25ed4f3..5a2a947debd8 100644
--- a/trunk/drivers/staging/hv/channel.c
+++ b/trunk/drivers/staging/hv/channel.c
@@ -549,22 +549,15 @@ EXPORT_SYMBOL_GPL(vmbus_teardown_gpadl);
 void vmbus_close(struct vmbus_channel *channel)
 {
 	struct vmbus_channel_close_channel *msg;
-	struct vmbus_channel_msginfo *info;
 	int ret;
 
 	/* Stop callback and cancel the timer asap */
 	channel->onchannel_callback = NULL;
 
 	/* Send a closing message */
-	info = kmalloc(sizeof(*info) +
-		       sizeof(struct vmbus_channel_close_channel), GFP_KERNEL);
-        /* FIXME: can't do anything other than return here because the
-	 *        function is void */
-	if (!info)
-		return;
 
+	msg = &channel->close_msg.msg;
 
-	msg = (struct vmbus_channel_close_channel *)info->msg;
 	msg->header.msgtype = CHANNELMSG_CLOSECHANNEL;
 	msg->child_relid = channel->offermsg.child_relid;
 
@@ -583,7 +576,6 @@ void vmbus_close(struct vmbus_channel *channel)
 	free_pages((unsigned long)channel->ringbuffer_pages,
 		get_order(channel->ringbuffer_pagecount * PAGE_SIZE));
 
-	kfree(info);
 
 }
 EXPORT_SYMBOL_GPL(vmbus_close);