p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
K. Y. Srinivasan 2015-02-28 11:18:16 -08:00 committed by Greg Kroah-Hartman
parent 04653a009a
commit d15a0301c4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/hv/vmbus_drv.c
View File

@ -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;
} }