Drivers: hv: vmbus: Fix a bug in the handling of channel offers

The channel state should be correctly set before registering the device. In the current
code the driver probe would fail for channels that have been rescinded and subsequently
re-offered. Fix the bug.

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

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 12ec8c801b25..bbff5f200bef 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -293,6 +293,13 @@ static void vmbus_process_offer(struct work_struct *work)
         }
 
         /*
+         * This state is used to indicate a successful open
+         * so that when we do close the channel normally, we
+         * can cleanup properly
+         */
+        newchannel->state = CHANNEL_OPEN_STATE;
+
+        /*
          * Start the process of binding this offer to the driver
          * We need to set the DeviceObject field before calling
          * vmbus_child_dev_add()
@@ -318,13 +325,6 @@ static void vmbus_process_offer(struct work_struct *work)
                 kfree(newchannel->device_obj);
 
                 free_channel(newchannel);
-        } else {
-                /*
-                 * This state is used to indicate a successful open
-                 * so that when we do close the channel normally, we
-                 * can cleanup properly
-                 */
-                newchannel->state = CHANNEL_OPEN_STATE;
         }
 }