Skip to content

Commit

Permalink
Staging: hv: netvsc: Cleanup error returns in netvsc_connect_vsp()
Browse files Browse the repository at this point in the history
Use standard Linux error codes.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 25, 2011
1 parent 927bc33 commit 0f48c72
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/staging/hv/netvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ static int netvsc_connect_vsp(struct hv_device *device)
if (!net_device) {
dev_err(&device->device, "unable to get net device..."
"device being destroyed?");
return -1;
return -ENODEV;
}

init_packet = &net_device->channel_init_pkt;
Expand Down Expand Up @@ -354,13 +354,13 @@ static int netvsc_connect_vsp(struct hv_device *device)

if (init_packet->msg.init_msg.init_complete.status !=
NVSP_STAT_SUCCESS) {
ret = -1;
ret = -EINVAL;
goto cleanup;
}

if (init_packet->msg.init_msg.init_complete.
negotiated_protocol_ver != NVSP_PROTOCOL_VERSION_1) {
ret = -1;
ret = -EPROTO;
goto cleanup;
}
/* Send the ndis version */
Expand All @@ -381,10 +381,8 @@ static int netvsc_connect_vsp(struct hv_device *device)
sizeof(struct nvsp_message),
(unsigned long)init_packet,
VM_PKT_DATA_INBAND, 0);
if (ret != 0) {
ret = -1;
if (ret != 0)
goto cleanup;
}

/* Post the big receive buffer to NetVSP */
ret = netvsc_init_recv_buf(device);
Expand Down

0 comments on commit 0f48c72

Please sign in to comment.