From: K. Y. Srinivasan Date: Thu, 25 Aug 2011 16:49:02 +0000 (-0700) Subject: Staging: hv: storvsc: Cleanup error handling in storvsc_dev_add() X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~864^2~55 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d225d36b13927defee0f5d51ade9987bb617d465;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Staging: hv: storvsc: Cleanup error handling in storvsc_dev_add() Use standard Linux error values and cleanup error handling. I would like to acknowledge Andre Bartke (andre.bartke@gmail.com) for highlighting this problem. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c index 302978611943..915aeeed11a1 100644 --- a/drivers/staging/hv/storvsc.c +++ b/drivers/staging/hv/storvsc.c @@ -392,10 +392,8 @@ int storvsc_dev_add(struct hv_device *device, device_info = (struct storvsc_device_info *)additional_info; stor_device = alloc_stor_device(device); - if (!stor_device) { - ret = -1; - goto cleanup; - } + if (!stor_device) + return -ENOMEM; /* Save the channel properties to our storvsc channel */ @@ -409,11 +407,13 @@ int storvsc_dev_add(struct hv_device *device, stor_device->port_number = device_info->port_number; /* Send it back up */ ret = storvsc_connect_to_vsp(device, device_info->ring_buffer_size); - + if (ret) { + free_stor_device(stor_device); + return ret; + } device_info->path_id = stor_device->path_id; device_info->target_id = stor_device->target_id; -cleanup: return ret; }