aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Jones <drjones@redhat.com>2017-07-24 09:38:32 -0400
committerMichael S. Tsirkin <mst@redhat.com>2017-07-25 09:37:36 -0400
commitcfa0ebc9d6d6308564f5174ecb655b9d504b2be5 (patch)
tree910ffe5323fd35fa7f58b24ec19fff5ea888a651
parentf9aada5fff212913372410ae45c18c7c3cade67a (diff)
virtio-net: fix module unloading
Unregister the driver before removing multi-instance hotplug callbacks. This order avoids the warning issued from __cpuhp_remove_state_cpuslocked when the number of remaining instances isn't yet zero. Fixes: 8017c279196a ("net/virtio-net: Convert to hotplug state machine") Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Andrew Jones <drjones@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--drivers/net/virtio_net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 99a26a9efec1..f41ab0ea942a 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2743,9 +2743,9 @@ module_init(virtio_net_driver_init);
2743 2743
2744static __exit void virtio_net_driver_exit(void) 2744static __exit void virtio_net_driver_exit(void)
2745{ 2745{
2746 unregister_virtio_driver(&virtio_net_driver);
2746 cpuhp_remove_multi_state(CPUHP_VIRT_NET_DEAD); 2747 cpuhp_remove_multi_state(CPUHP_VIRT_NET_DEAD);
2747 cpuhp_remove_multi_state(virtionet_online); 2748 cpuhp_remove_multi_state(virtionet_online);
2748 unregister_virtio_driver(&virtio_net_driver);
2749} 2749}
2750module_exit(virtio_net_driver_exit); 2750module_exit(virtio_net_driver_exit);
2751 2751