Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267968
b: refs/heads/master
c: fdb3c32
h: refs/heads/master
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 25, 2011
1 parent c186f90 commit 81d39a6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 327efbae1f96743c9b208e8a4c667eea9b8cf6c0
refs/heads/master: fdb3c32cb7b80d28f23f005543eb4f0d6e88c2a3
22 changes: 11 additions & 11 deletions trunk/drivers/staging/hv/hv_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,

if (!input_device->hid_desc) {
pr_err("unable to allocate hid descriptor - size %d", desc->bLength);
goto Cleanup;
goto cleanup;
}

memcpy(input_device->hid_desc, desc, desc->bLength);
Expand All @@ -349,7 +349,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
if (!input_device->report_desc) {
pr_err("unable to allocate report descriptor - size %d",
input_device->report_desc_size);
goto Cleanup;
goto cleanup;
}

memcpy(input_device->report_desc,
Expand All @@ -376,15 +376,15 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
if (ret != 0) {
pr_err("unable to send synthhid device info ack - ret %d",
ret);
goto Cleanup;
goto cleanup;
}

input_device->device_wait_condition = 1;
wake_up(&input_device->dev_info_wait_event);

return;

Cleanup:
cleanup:
kfree(input_device->hid_desc);
input_device->hid_desc = NULL;

Expand Down Expand Up @@ -603,15 +603,15 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if (ret != 0) {
pr_err("unable to send synthhid protocol request.");
goto Cleanup;
goto cleanup;
}

input_dev->protocol_wait_condition = 0;
wait_event_timeout(input_dev->protocol_wait_event,
input_dev->protocol_wait_condition, msecs_to_jiffies(1000));
if (input_dev->protocol_wait_condition == 0) {
ret = -ETIMEDOUT;
goto Cleanup;
goto cleanup;
}

response = &input_dev->protocol_resp;
Expand All @@ -620,15 +620,15 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
pr_err("synthhid protocol request failed (version %d)",
SYNTHHID_INPUT_VERSION);
ret = -1;
goto Cleanup;
goto cleanup;
}

input_dev->device_wait_condition = 0;
wait_event_timeout(input_dev->dev_info_wait_event,
input_dev->device_wait_condition, msecs_to_jiffies(1000));
if (input_dev->device_wait_condition == 0) {
ret = -ETIMEDOUT;
goto Cleanup;
goto cleanup;
}

/*
Expand All @@ -640,7 +640,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
else
ret = -1;

Cleanup:
cleanup:
put_input_device(device);

return ret;
Expand All @@ -658,7 +658,7 @@ static int mousevsc_on_device_add(struct hv_device *device,

if (!input_dev) {
ret = -1;
goto Cleanup;
goto cleanup;
}

input_dev->init_complete = false;
Expand Down Expand Up @@ -711,7 +711,7 @@ static int mousevsc_on_device_add(struct hv_device *device,

input_dev->init_complete = true;

Cleanup:
cleanup:
return ret;
}

Expand Down

0 comments on commit 81d39a6

Please sign in to comment.