Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249142
b: refs/heads/master
c: d87d707
h: refs/heads/master
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 25, 2011
1 parent b9ed692 commit 42baa5f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c4c58c583c1e21adc2b04316170c4fc355ab0123
refs/heads/master: d87d707d60aeda28d374a9a3ed8d3c0be13a75b8
12 changes: 6 additions & 6 deletions trunk/drivers/staging/hv/blkvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ static int blkvsc_probe(struct device *device)
blkdev = kzalloc(sizeof(struct block_device_context), GFP_KERNEL);
if (!blkdev) {
ret = -ENOMEM;
goto Cleanup;
goto cleanup;
}

INIT_LIST_HEAD(&blkdev->pending_list);
Expand All @@ -977,14 +977,14 @@ static int blkvsc_probe(struct device *device)
SLAB_HWCACHE_ALIGN, NULL);
if (!blkdev->request_pool) {
ret = -ENOMEM;
goto Cleanup;
goto cleanup;
}


/* Call to the vsc driver to add the device */
ret = storvsc_drv_obj->base.dev_add(device_obj, &device_info);
if (ret != 0)
goto Cleanup;
goto cleanup;

blkdev->device_ctx = device_obj;
/* this identified the device 0 or 1 */
Expand Down Expand Up @@ -1027,15 +1027,15 @@ static int blkvsc_probe(struct device *device)
}
} else {
ret = -1;
goto Cleanup;
goto cleanup;
}

DPRINT_INFO(BLKVSC_DRV, "blkvsc registered for major %d!!", major);

blkdev->gd = alloc_disk(BLKVSC_MINORS);
if (!blkdev->gd) {
ret = -1;
goto Cleanup;
goto cleanup;
}

blkdev->gd->queue = blk_init_queue(blkvsc_request, &blkdev->lock);
Expand Down Expand Up @@ -1074,7 +1074,7 @@ static int blkvsc_probe(struct device *device)
Remove:
storvsc_drv_obj->base.dev_rm(device_obj);

Cleanup:
cleanup:
if (blkdev) {
if (blkdev->request_pool) {
kmem_cache_destroy(blkdev->request_pool);
Expand Down

0 comments on commit 42baa5f

Please sign in to comment.