diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-02 15:02:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-02 15:02:04 +0100 |
| commit | 87ad3722bfef925ac2379257cbc512d77d8c4d44 (patch) | |
| tree | 6df6210af7e3093c6ba5c99d24e435366fa89675 /drivers/hv/vmbus_drv.c | |
| parent | staging: pi433: remove unused rf69_set_dc_cut_off_frequency* functions (diff) | |
| parent | Linux 4.15-rc6 (diff) | |
| download | linux-87ad3722bfef925ac2379257cbc512d77d8c4d44.tar.xz linux-87ad3722bfef925ac2379257cbc512d77d8c4d44.zip | |
Merge 4.15-rc6 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv/vmbus_drv.c')
| -rw-r--r-- | drivers/hv/vmbus_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 76ed9a216f10..610223f0e945 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -1378,6 +1378,8 @@ void vmbus_device_unregister(struct hv_device *device_obj) pr_debug("child device %s unregistered\n", dev_name(&device_obj->device)); + kset_unregister(device_obj->channels_kset); + /* * Kick off the process of unregistering the device. * This will call vmbus_remove() and eventually vmbus_device_release() |