diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-24 05:58:30 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-24 05:58:30 +0300 |
| commit | 24a81a2c258177ba334838a372651f784953b03a (patch) | |
| tree | 6c3ea896b8a690ed43def034f3f5b885069397b4 /drivers/hv | |
| parent | 91c17449fe04adfb12ff9523f62e9cd0d658a88d (diff) | |
| parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
| download | linux-24a81a2c258177ba334838a372651f784953b03a.tar.xz | |
Merge 4.13-rc2 into char-misc-next
We want the char/misc driver fixes in here as well to handle future
changes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
| -rw-r--r-- | drivers/hv/channel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index e9bf0bb87ac4..e57cc40cb768 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -606,6 +606,8 @@ static int vmbus_close_internal(struct vmbus_channel *channel) get_order(channel->ringbuffer_pagecount * PAGE_SIZE)); out: + /* re-enable tasklet for use on re-open */ + tasklet_enable(&channel->callback_event); return ret; } |