1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 1ef37c727572..d037454fe7b8 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -73,7 +73,6 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
         void *in, *out;
         unsigned long flags;
         int ret, err = 0;
-        unsigned long t;
         struct page *page;
 
         spin_lock_irqsave(&newchannel->lock, flags);
@@ -183,11 +182,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
                 goto error1;
         }
 
-        t = wait_for_completion_timeout(&open_info->waitevent, 5*HZ);
-        if (t == 0) {
-                err = -ETIMEDOUT;
-                goto error1;
-        }
+        wait_for_completion(&open_info->waitevent);
 
         spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
         list_del(&open_info->msglistentry);
@@ -375,7 +370,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
         struct vmbus_channel_gpadl_header *gpadlmsg;
         struct vmbus_channel_gpadl_body *gpadl_body;
         struct vmbus_channel_msginfo *msginfo = NULL;
-        struct vmbus_channel_msginfo *submsginfo;
+        struct vmbus_channel_msginfo *submsginfo, *tmp;
         u32 msgcount;
         struct list_head *curr;
         u32 next_gpadl_handle;
@@ -437,6 +432,13 @@ cleanup:
         list_del(&msginfo->msglistentry);
         spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
 
+        if (msgcount > 1) {
+                list_for_each_entry_safe(submsginfo, tmp, &msginfo->submsglist,
+                         msglistentry) {
+                        kfree(submsginfo);
+                }
+        }
+
         kfree(msginfo);
         return ret;
 }