From 0afce30dadc2c35a0b78b2a81bd6260c4e0d43ea Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Mon, 6 Jun 2011 15:49:35 -0700
Subject: [PATCH] --- yaml --- r: 259443 b: refs/heads/master c:
 604a1eb0eb67c38e29f9efd8d20668904f93b50c h: refs/heads/master i:   259441:
 87ef84116c23aba711ec6d15d5c9a0e18b1cbe57   259439:
 9b322819ac1b66304f1441e0bdf93c5037e0e029 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/staging/hv/channel.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 008d3de83e5d..6a56925c3056 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2aa05dcbfbc017ac99c15de8da9d6c840a3acd5b
+refs/heads/master: 604a1eb0eb67c38e29f9efd8d20668904f93b50c
diff --git a/trunk/drivers/staging/hv/channel.c b/trunk/drivers/staging/hv/channel.c
index f655e59a9a8f..aca9ac8cc376 100644
--- a/trunk/drivers/staging/hv/channel.c
+++ b/trunk/drivers/staging/hv/channel.c
@@ -552,7 +552,6 @@ void vmbus_close(struct vmbus_channel *channel)
 {
 	struct vmbus_channel_close_channel *msg;
 	struct vmbus_channel_msginfo *info;
-	unsigned long flags;
 	int ret;
 
 	/* Stop callback and cancel the timer asap */
@@ -591,19 +590,6 @@ void vmbus_close(struct vmbus_channel *channel)
 
 	kfree(info);
 
-	/*
-	 * If we are closing the channel during an error path in
-	 * opening the channel, don't free the channel since the
-	 * caller will free the channel
-	 */
-
-	if (channel->state == CHANNEL_OPEN_STATE) {
-		spin_lock_irqsave(&vmbus_connection.channel_lock, flags);
-		list_del(&channel->listentry);
-		spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);
-
-		free_channel(channel);
-	}
 }
 EXPORT_SYMBOL_GPL(vmbus_close);