Drivers: hv: vmbus: Properly handle child device remove

Handle the case when the device may be removed when the device has no driver
attached to it.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 6d99aa5c49d6..a12666d075ea 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -508,14 +508,17 @@ static int vmbus_probe(struct device *child_device)
  */
 static int vmbus_remove(struct device *child_device)
 {
-        struct hv_driver *drv = drv_to_hv_drv(child_device->driver);
+        struct hv_driver *drv;
         struct hv_device *dev = device_to_hv_device(child_device);
 
-        if (drv->remove)
-                drv->remove(dev);
-        else
-                pr_err("remove not set for driver %s\n",
-                        dev_name(child_device));
+        if (child_device->driver) {
+                drv = drv_to_hv_drv(child_device->driver);
+                if (drv->remove)
+                        drv->remove(dev);
+                else
+                        pr_err("remove not set for driver %s\n",
+                                dev_name(child_device));
+        }
 
         return 0;
 }