Drivers: hv: vmbus: Fix a bug in channel rescind code

Rescind of subchannels were not being correctly handled. Fix the bug.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Cc: <stable@vger.kernel.org>        [3.11+]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index bbff5f200bef..fa920469bf10 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -203,7 +203,8 @@ static void vmbus_process_rescind_offer(struct work_struct *work)
         struct vmbus_channel *primary_channel;
         struct vmbus_channel_relid_released msg;
 
-        vmbus_device_unregister(channel->device_obj);
+        if (channel->device_obj)
+                vmbus_device_unregister(channel->device_obj);
         memset(&msg, 0, sizeof(struct vmbus_channel_relid_released));
         msg.child_relid = channel->offermsg.child_relid;
         msg.header.msgtype = CHANNELMSG_RELID_RELEASED;
@@ -216,7 +217,7 @@ static void vmbus_process_rescind_offer(struct work_struct *work)
         } else {
                 primary_channel = channel->primary_channel;
                 spin_lock_irqsave(&primary_channel->sc_lock, flags);
-                list_del(&channel->listentry);
+                list_del(&channel->sc_list);
                 spin_unlock_irqrestore(&primary_channel->sc_lock, flags);
         }
         free_channel(channel);