lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: hv: netvsc: Cleanup error returns in netvsc_connect_vsp()

Browse Source 
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>
This commit is contained in:
K. Y. Srinivasan
2011-08-25 09:49:14 -07:00
committed by Greg Kroah-Hartman
parent 927bc33c0a
commit 0f48c72ca6
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/hv/netvsc.c
View File

@@ -323,7 +323,7 @@ static int netvsc_connect_vsp(struct hv_device *device)
if (!net_device) { if (!net_device) {
dev_err(&device->device, "unable to get net device..." dev_err(&device->device, "unable to get net device..."
"device being destroyed?"); "device being destroyed?");
return -1; return -ENODEV;
} }
init_packet = &net_device->channel_init_pkt; init_packet = &net_device->channel_init_pkt;
@@ -354,13 +354,13 @@ static int netvsc_connect_vsp(struct hv_device *device)
if (init_packet->msg.init_msg.init_complete.status != if (init_packet->msg.init_msg.init_complete.status !=
NVSP_STAT_SUCCESS) { NVSP_STAT_SUCCESS) {
ret = -1; ret = -EINVAL;
goto cleanup; goto cleanup;
} }
if (init_packet->msg.init_msg.init_complete. if (init_packet->msg.init_msg.init_complete.
negotiated_protocol_ver != NVSP_PROTOCOL_VERSION_1) { negotiated_protocol_ver != NVSP_PROTOCOL_VERSION_1) {
ret = -1; ret = -EPROTO;
goto cleanup; goto cleanup;
} }
/* Send the ndis version */ /* Send the ndis version */
@@ -381,10 +381,8 @@ static int netvsc_connect_vsp(struct hv_device *device)
sizeof(struct nvsp_message), sizeof(struct nvsp_message),
(unsigned long)init_packet, (unsigned long)init_packet,
VM_PKT_DATA_INBAND, 0); VM_PKT_DATA_INBAND, 0);
if (ret != 0) { if (ret != 0)
ret = -1;
goto cleanup; goto cleanup;
}
/* Post the big receive buffer to NetVSP */ /* Post the big receive buffer to NetVSP */
ret = netvsc_init_recv_buf(device); ret = netvsc_init_recv_buf(device);