summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2015-02-28 11:18:16 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-01 19:31:02 -0800
commitd15a0301c4157884d1a48a5d76b9ac3e36d71242 (patch)
tree8604ba0a730d1610743b1dc4818564cac4a602b3 /drivers
parent04653a009a63d6a91c60a5449ea97e3ed5e1dc29 (diff)
downloadlinux-d15a0301c4157884d1a48a5d76b9ac3e36d71242.tar.bz2
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hv/vmbus_drv.c15
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;
}