summaryrefslogtreecommitdiffstats
path: root/drivers/hv
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2013-09-05 00:41:58 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 23:20:22 +0200
commit8bbf9f440f196ee08cc5ab1c19e62b1c5a736ff0 (patch)
tree5968ff56a1ccb419ef7aca1c0594b234d42b1cb6 /drivers/hv
parentDrivers: hv: util: Correctly support ws2008R2 and earlier (diff)
downloadlinux-8bbf9f440f196ee08cc5ab1c19e62b1c5a736ff0.tar.xz
linux-8bbf9f440f196ee08cc5ab1c19e62b1c5a736ff0.zip
Drivers: hv: vmbus: Terminate vmbus version negotiation on timeout
commit 666b9adc801ef012612c4e43e0f44b2cdc1979cf terminated vmbus version negotiation incorrectly. We need to terminate the version negotiation only if the current negotiation were to timeout. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Cc: Olaf Hering <ohering@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
-rw-r--r--drivers/hv/connection.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
index 8f4743ab5fb2..936093e0271e 100644
--- a/drivers/hv/connection.c
+++ b/drivers/hv/connection.c
@@ -195,7 +195,7 @@ int vmbus_connect(void)
do {
ret = vmbus_negotiate_version(msginfo, version);
- if (ret)
+ if (ret == -ETIMEDOUT)
goto cleanup;
if (vmbus_connection.conn_state == CONNECTED)