diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-23 17:21:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-23 17:21:44 +0200 |
| commit | 6fbf248a20d362a92de60beee9474faca0b54eee (patch) | |
| tree | b5365be73b420be3b6036fb40aaf1b167c90b180 /drivers/hv | |
| parent | de4ce2d1ad1bb3304d4107160c9551b7fd8d8ec5 (diff) | |
| parent | bb176f67090ca54869fc1262c913aa69d2ede070 (diff) | |
| download | linux-6fbf248a20d362a92de60beee9474faca0b54eee.tar.gz linux-6fbf248a20d362a92de60beee9474faca0b54eee.tar.bz2 linux-6fbf248a20d362a92de60beee9474faca0b54eee.zip | |
Merge 4.14-rc6 into char-misc-next
We want the driver fixes in here and this resolves a merge issue with
the binder driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
| -rw-r--r-- | drivers/hv/channel_mgmt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c index c942a1120cb9..a8dc9a164631 100644 --- a/drivers/hv/channel_mgmt.c +++ b/drivers/hv/channel_mgmt.c @@ -945,7 +945,10 @@ void vmbus_hvsock_device_unregister(struct vmbus_channel *channel) { BUG_ON(!is_hvsock_channel(channel)); - channel->rescind = true; + /* We always get a rescind msg when a connection is closed. */ + while (!READ_ONCE(channel->probe_done) || !READ_ONCE(channel->rescind)) + msleep(1); + vmbus_device_unregister(channel->device_obj); } EXPORT_SYMBOL_GPL(vmbus_hvsock_device_unregister); |