lkml.org 
[lkml]   [2011]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 48/59] Staging: hv: netvsc: Cleanup error returns in netvsc_connect_vsp()
    Date
    Use standard Linux error codes.

    Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    ---
    drivers/staging/hv/netvsc.c | 10 ++++------
    1 files changed, 4 insertions(+), 6 deletions(-)

    diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
    index 5703fd7..9cc126b 100644
    --- a/drivers/staging/hv/netvsc.c
    +++ b/drivers/staging/hv/netvsc.c
    @@ -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);
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-08-25 18:37    [W:5.261 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site