From 05cd15d1d17f1aff582f13012a7a90c0cdca37ad Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 29 Sep 2011 11:54:50 -0700 Subject: [PATCH] --- yaml --- r: 268662 b: refs/heads/master c: 5cd4d0302cc3a53b4fb48006d448f44f666f1569 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/hv_mouse.c | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index b258ad6d8088..b1a4df09e016 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b1f0da005928c1cc761c320e6919b719a090a07 +refs/heads/master: 5cd4d0302cc3a53b4fb48006d448f44f666f1569 diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c index 8dd902a901b0..fc1f3e60d0f4 100644 --- a/trunk/drivers/staging/hv/hv_mouse.c +++ b/trunk/drivers/staging/hv/hv_mouse.c @@ -569,7 +569,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device) if (!input_dev) { pr_err("unable to get input device...device being destroyed?"); - return -1; + return -ENODEV; } @@ -612,7 +612,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device) if (!response->response.approved) { pr_err("synthhid protocol request failed (version %d)", SYNTHHID_INPUT_VERSION); - ret = -1; + ret = -ENODEV; goto cleanup; } @@ -629,7 +629,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device) if (!input_dev->dev_info_status) pr_info("**** input channel up and running!! ****"); else - ret = -1; + ret = -ENOMEM; cleanup: put_input_device(device); @@ -694,10 +694,8 @@ static int mousevsc_on_device_add(struct hv_device *device, input_dev = alloc_input_device(device); - if (!input_dev) { - ret = -1; - goto cleanup; - } + if (!input_dev) + return -ENOMEM; input_dev->init_complete = false; @@ -714,7 +712,7 @@ static int mousevsc_on_device_add(struct hv_device *device, if (ret != 0) { pr_err("unable to open channel: %d", ret); free_input_device(input_dev); - return -1; + return ret; } pr_info("InputVsc channel open: %d", ret); @@ -743,7 +741,6 @@ static int mousevsc_on_device_add(struct hv_device *device, input_dev->init_complete = true; -cleanup: return ret; } @@ -789,16 +786,10 @@ static int mousevsc_on_device_remove(struct hv_device *device) static int mousevsc_probe(struct hv_device *dev, const struct hv_vmbus_device_id *dev_id) { - int ret = 0; - /* Call to the vsc driver to add the device */ - ret = mousevsc_on_device_add(dev, NULL); + return mousevsc_on_device_add(dev, NULL); - if (ret != 0) - return -1; - - return 0; } static int mousevsc_remove(struct hv_device *dev)