Drivers: hv: vmbus: Fix the issue with freeing up hv_ctl_table_hdr

[sfrench/cifs-2.6.git] / drivers / hv / vmbus_drv.c

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index a7f33c1f42c5a79a406a0af72b25c40f651d81a7..5e946b1be54c4d0312bb4048d575e81b396c1f7d 100644 (file)
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -1176,11 +1176,8 @@ err_alloc:
 
        bus_unregister(&hv_bus);
        free_page((unsigned long)hv_panic_page);
-       if (!hv_ctl_table_hdr) {
-               unregister_sysctl_table(hv_ctl_table_hdr);
-               hv_ctl_table_hdr = NULL;
-       }
-
+       unregister_sysctl_table(hv_ctl_table_hdr);
+       hv_ctl_table_hdr = NULL;
        return ret;
 }
 
@@ -1891,11 +1888,8 @@ static void __exit vmbus_exit(void)
        }
 
        free_page((unsigned long)hv_panic_page);
-       if (!hv_ctl_table_hdr) {
-               unregister_sysctl_table(hv_ctl_table_hdr);
-               hv_ctl_table_hdr = NULL;
-       }
-
+       unregister_sysctl_table(hv_ctl_table_hdr);
+       hv_ctl_table_hdr = NULL;
        bus_unregister(&hv_bus);
 
        cpuhp_remove_state(hyperv_cpuhp_online);