1 files changed, 27 insertions, 3 deletions

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 0c048dd8013f..a220e5746d67 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -62,6 +62,14 @@ struct hv_device_info {
         struct hv_dev_port_info outbound;
 };
 
+static int vmbus_exists(void)
+{
+        if (hv_acpi_dev == NULL)
+                return -ENODEV;
+
+        return 0;
+}
+
 
 static void get_channel_info(struct hv_device *device,
                              struct hv_device_info *info)
@@ -590,6 +598,10 @@ int __vmbus_driver_register(struct hv_driver *hv_driver, struct module *owner, c
 
         pr_info("registering driver %s\n", hv_driver->name);
 
+        ret = vmbus_exists();
+        if (ret < 0)
+                return ret;
+
         hv_driver->driver.name = hv_driver->name;
         hv_driver->driver.owner = owner;
         hv_driver->driver.mod_name = mod_name;
@@ -614,8 +626,8 @@ void vmbus_driver_unregister(struct hv_driver *hv_driver)
 {
         pr_info("unregistering driver %s\n", hv_driver->name);
 
-        driver_unregister(&hv_driver->driver);
-
+        if (!vmbus_exists())
+                driver_unregister(&hv_driver->driver);
 }
 EXPORT_SYMBOL_GPL(vmbus_driver_unregister);
 
@@ -776,11 +788,23 @@ static int __init hv_acpi_init(void)
 
 cleanup:
         acpi_bus_unregister_driver(&vmbus_acpi_driver);
+        hv_acpi_dev = NULL;
         return ret;
 }
 
+static void __exit vmbus_exit(void)
+{
+
+        free_irq(irq, hv_acpi_dev);
+        vmbus_free_channels();
+        bus_unregister(&hv_bus);
+        hv_cleanup();
+        acpi_bus_unregister_driver(&vmbus_acpi_driver);
+}
+
 
 MODULE_LICENSE("GPL");
 MODULE_VERSION(HV_DRV_VERSION);
 
-module_init(hv_acpi_init);
+subsys_initcall(hv_acpi_init);
+module_exit(vmbus_exit);