Commit d15a0301 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman

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: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 04653a00
...@@ -508,14 +508,17 @@ static int vmbus_probe(struct device *child_device) ...@@ -508,14 +508,17 @@ static int vmbus_probe(struct device *child_device)
*/ */
static int vmbus_remove(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); struct hv_device *dev = device_to_hv_device(child_device);
if (drv->remove) if (child_device->driver) {
drv->remove(dev); drv = drv_to_hv_drv(child_device->driver);
else if (drv->remove)
pr_err("remove not set for driver %s\n", drv->remove(dev);
dev_name(child_device)); else
pr_err("remove not set for driver %s\n",
dev_name(child_device));
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment