Drivers: hv: vmbus: Cleanup vmbus_close_internal()

[pandora-kernel.git] / drivers / hv / channel.c

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 7bbbb95..44a1ea4 100644 (file)
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -531,11 +531,28 @@ void vmbus_close(struct vmbus_channel *channel)
 
        ret = vmbus_post_msg(msg, sizeof(struct vmbus_channel_close_channel));
 
-       BUG_ON(ret != 0);
+       if (ret) {
+               pr_err("Close failed: close post msg return is %d\n", ret);
+               /*
+                * If we failed to post the close msg,
+                * it is perhaps better to leak memory.
+                */
+               return;
+       }
+
        /* Tear down the gpadl for the channel's ring buffer */
-       if (channel->ringbuffer_gpadlhandle)
-               vmbus_teardown_gpadl(channel,
-                                         channel->ringbuffer_gpadlhandle);
+       if (channel->ringbuffer_gpadlhandle) {
+               ret = vmbus_teardown_gpadl(channel,
+                                          channel->ringbuffer_gpadlhandle);
+               if (ret) {
+                       pr_err("Close failed: teardown gpadl return %d\n", ret);
+                       /*
+                        * If we failed to teardown gpadl,
+                        * it is perhaps better to leak memory.
+                        */
+                       return;
+               }
+       }
 
        /* Cleanup the ring buffers for this channel */
        hv_ringbuffer_cleanup(&channel->outbound);