From 336957b59731a0d0faaf3a8afcb436aab51575ab Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Mon, 7 Mar 2011 13:22:20 -0800 Subject: [PATCH] --- yaml --- r: 236314 b: refs/heads/master c: 38fadc3e1f2ed55544acb75823ba7b2929597f68 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/blkvsc_drv.c | 2 +- trunk/drivers/staging/hv/vmbus_drv.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5d0a9ad052e2..d546f78accfb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94851c343d1f98f866760c96a8956e30b07e579c +refs/heads/master: 38fadc3e1f2ed55544acb75823ba7b2929597f68 diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c index 3e86a560074e..9ccd5dcc353a 100644 --- a/trunk/drivers/staging/hv/blkvsc_drv.c +++ b/trunk/drivers/staging/hv/blkvsc_drv.c @@ -188,7 +188,7 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv)) drv_ctx->driver.probe = blkvsc_probe; drv_ctx->driver.remove = blkvsc_remove; - drv_ctx->shutdown = blkvsc_shutdown; + drv_ctx->driver.shutdown = blkvsc_shutdown; /* The driver belongs to vmbus */ ret = vmbus_child_driver_register(drv_ctx); diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c index 4df2be04fd14..6ef5bee65cac 100644 --- a/trunk/drivers/staging/hv/vmbus_drv.c +++ b/trunk/drivers/staging/hv/vmbus_drv.c @@ -1000,8 +1000,8 @@ static void vmbus_shutdown(struct device *child_device) driver_ctx = driver_to_driver_context(child_device->driver); /* Let the specific open-source driver handles the removal if it can */ - if (driver_ctx->shutdown) - driver_ctx->shutdown(child_device); + if (driver_ctx->driver.shutdown) + driver_ctx->driver.shutdown(child_device); return; }