Staging: hv: netvsc: Cleanup error returns in netvsc_connect_vsp()
authorK. Y. Srinivasan <kys@microsoft.com>
Thu, 25 Aug 2011 16:49:14 +0000 (09:49 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 25 Aug 2011 22:32:11 +0000 (15:32 -0700)
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>
drivers/staging/hv/netvsc.c

index 5703fd7c5246f92454c7fe40741b9774090b7457..9cc126ba8d7413c16265cbba01b438ac26b5fde4 100644 (file)
@@ -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;
@@ -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 */
@@ -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);