Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249139
b: refs/heads/master
c: e01c33b
h: refs/heads/master
i:
  249137: 3e6c282
  249135: 1714fe6
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 25, 2011
1 parent f95a7df commit 3093b69
Show file tree
Hide file tree
Showing 2 changed files with 4 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: d49198299928122d98ae7ca35dd824eaf8746ccd
refs/heads/master: e01c33b886e7bcf44c8861853fb475efd248053c
9 changes: 3 additions & 6 deletions trunk/drivers/staging/hv/blkvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
* Authors:
* Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com>
*
* 4/3/2011: K. Y. Srinivasan - Significant restructuring and cleanup.
*/
#include <linux/init.h>
#include <linux/module.h>
Expand Down Expand Up @@ -967,7 +969,6 @@ static int blkvsc_probe(struct device *device)


if (!storvsc_drv_obj->base.dev_add) {
DPRINT_ERR(BLKVSC_DRV, "OnDeviceAdd() not set");
ret = -1;
goto Cleanup;
}
Expand Down Expand Up @@ -995,10 +996,8 @@ static int blkvsc_probe(struct device *device)

/* Call to the vsc driver to add the device */
ret = storvsc_drv_obj->base.dev_add(device_obj, &device_info);
if (ret != 0) {
DPRINT_ERR(BLKVSC_DRV, "unable to add blkvsc device");
if (ret != 0)
goto Cleanup;
}

blkdev->device_ctx = device_obj;
/* this identified the device 0 or 1 */
Expand Down Expand Up @@ -1040,7 +1039,6 @@ static int blkvsc_probe(struct device *device)
ide1_registered = 1;
}
} else {
DPRINT_ERR(BLKVSC_DRV, "invalid pathid");
ret = -1;
goto Cleanup;
}
Expand All @@ -1049,7 +1047,6 @@ static int blkvsc_probe(struct device *device)

blkdev->gd = alloc_disk(BLKVSC_MINORS);
if (!blkdev->gd) {
DPRINT_ERR(BLKVSC_DRV, "register_blkdev() failed! ret %d", ret);
ret = -1;
goto Cleanup;
}
Expand Down

0 comments on commit 3093b69

Please sign in to comment.