diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/hv/connection.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/hv/connection.c')
| -rw-r--r-- | drivers/hv/connection.c | 2 |
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) | |||
| 195 | 195 | ||
| 196 | do { | 196 | do { |
| 197 | ret = vmbus_negotiate_version(msginfo, version); | 197 | ret = vmbus_negotiate_version(msginfo, version); |
| 198 | if (ret) | 198 | if (ret == -ETIMEDOUT) |
| 199 | goto cleanup; | 199 | goto cleanup; |
| 200 | 200 | ||
| 201 | if (vmbus_connection.conn_state == CONNECTED) | 201 | if (vmbus_connection.conn_state == CONNECTED) |