diff --git a/[refs] b/[refs] index 4a7a6f77cde4..0218d34bcb76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9528b1d86ac85dcf277fdaa6d8e6d10ad029cfac +refs/heads/master: f9bf96a96d6d2c8ae239bc5c133c08bd785eb2f5 diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c index 659c4977f9f3..7914078b42fe 100644 --- a/trunk/drivers/staging/hv/blkvsc_drv.c +++ b/trunk/drivers/staging/hv/blkvsc_drv.c @@ -174,8 +174,6 @@ static int blk_vsc_initialize(struct hv_driver *driver) stor_driver = hvdr_to_stordr(driver); - memcpy(&driver->dev_type, &dev_type, sizeof(struct hv_guid)); - return ret; } @@ -841,6 +839,7 @@ static int blkvsc_drv_init(void) /* Callback to client driver to complete the initialization */ blk_vsc_initialize(&storvsc_drv->base); + memcpy(&drv->dev_type, &dev_type, sizeof(struct hv_guid)); drv->name = drv_name; drv->driver.name = drv_name;