diff --git a/[refs] b/[refs] index 5185766e8c12..0179f9b5081b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e757046fc84c7c3e8e6ea881a5d736078f750549 +refs/heads/master: 896ee0156412412383391a1692042c8f0c623f81 diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c index 11868cf7ffd5..e028db2cc024 100644 --- a/trunk/drivers/staging/hv/blkvsc_drv.c +++ b/trunk/drivers/staging/hv/blkvsc_drv.c @@ -196,7 +196,6 @@ static int blk_vsc_initialize(struct hv_driver *driver) stor_driver->max_outstanding_req_per_channel); /* Setup the dispatch table */ - stor_driver->base.cleanup = storvsc_cleanup; stor_driver->on_io_request = stor_vsc_on_io_request; return ret; @@ -917,8 +916,7 @@ static void blkvsc_drv_exit(void) device_unregister(current_dev); } - if (storvsc_drv->base.cleanup) - storvsc_drv->base.cleanup(&storvsc_drv->base); + storvsc_cleanup(&storvsc_drv->base); vmbus_child_driver_unregister(&drv->driver);