diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 18:27:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 18:27:03 -0700 |
| commit | d7173493683853047d6efc8d4454c70469a7b033 (patch) | |
| tree | 8e6dac16d3104494b5cc2f33756c582ecdc3b753 /drivers/hv/connection.c | |
| parent | 80d26236c7c583ea2f43b68008ab7e067102c62c (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| download | linux-d7173493683853047d6efc8d4454c70469a7b033.tar.bz2 | |
Merge 3.12-rc3 into char-misc-next
We need/want the mei fixes in here so we can apply other updates that
are depending on them.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 4faea979975e..af6edf9b1936 100644 --- a/drivers/hv/connection.c +++ b/drivers/hv/connection.c @@ -194,7 +194,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) |