aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2014-08-27 16:25:35 -0700
committerBen Hutchings <ben@decadent.org.uk>2014-12-14 16:23:43 +0000
commit2e4bf9fd096ce08b0f7999bb391d8f2ce0912964 (patch)
tree2875f91174529ed29c54160bc381c6d94ba5c457
parentbb076b385c7b50629136b8dc0300282c45d670da (diff)
downloadkernel_samsung_smdk4412-2e4bf9fd096ce08b0f7999bb391d8f2ce0912964.zip
kernel_samsung_smdk4412-2e4bf9fd096ce08b0f7999bb391d8f2ce0912964.tar.gz
kernel_samsung_smdk4412-2e4bf9fd096ce08b0f7999bb391d8f2ce0912964.tar.bz2
Drivers: hv: vmbus: Fix a bug in vmbus_open()
commit 45d727cee9e200f5b351528b9fb063b69cf702c8 upstream. Fix a bug in vmbus_open() and properly propagate the error. I would like to thank Dexuan Cui <decui@microsoft.com> for identifying the issue. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Tested-by: Sitsofe Wheeler <sitsofe@yahoo.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/hv/channel.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 1211d38..7bbbb95 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -207,8 +207,10 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
ret = vmbus_post_msg(open_msg,
sizeof(struct vmbus_channel_open_channel));
- if (ret != 0)
+ if (ret != 0) {
+ err = ret;
goto error1;
+ }
t = wait_for_completion_timeout(&open_info->waitevent, 5*HZ);
if (t == 0) {