Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267977
b: refs/heads/master
c: 3f4636e
h: refs/heads/master
i:
  267975: 37f693e
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Aug 25, 2011
1 parent be0ba33 commit 5894e3b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 18 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: 4bc694057bc95049ed8d451c2e142c79bbf97328
refs/heads/master: 3f4636e625204e74986e9f1f845229ebd6235f9e
23 changes: 6 additions & 17 deletions trunk/drivers/staging/hv/hv_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ struct input_device_context {
int connected;
};

static void inputreport_callback(struct hv_device *dev, void *packet, u32 len);
static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len);

static struct mousevsc_dev *alloc_input_device(struct hv_device *device)
Expand Down Expand Up @@ -403,6 +402,7 @@ static void mousevsc_on_receive_input_report(struct mousevsc_dev *input_device,
struct synthhid_input_report *input_report)
{
struct hv_driver *input_drv;
struct input_device_context *input_dev_ctx;

if (!input_device->init_complete) {
pr_info("Initialization incomplete...ignoring input_report msg");
Expand All @@ -411,9 +411,11 @@ static void mousevsc_on_receive_input_report(struct mousevsc_dev *input_device,

input_drv = drv_to_hv_drv(input_device->device->device.driver);

inputreport_callback(input_device->device,
input_report->buffer,
input_report->header.size);
input_dev_ctx = dev_get_drvdata(&input_device->device->device);

hid_input_report(input_dev_ctx->hid_device,
HID_INPUT_REPORT, input_report->buffer, input_report->header.size, 1);

}

static void mousevsc_on_receive(struct hv_device *device,
Expand Down Expand Up @@ -760,19 +762,6 @@ static int mousevsc_on_device_remove(struct hv_device *device)
}


static void inputreport_callback(struct hv_device *dev, void *packet, u32 len)
{
int ret = 0;

struct input_device_context *input_dev_ctx =
dev_get_drvdata(&dev->device);

ret = hid_input_report(input_dev_ctx->hid_device,
HID_INPUT_REPORT, packet, len, 1);

DPRINT_DBG(INPUTVSC_DRV, "hid_input_report (ret %d)", ret);
}

static int mousevsc_hid_open(struct hid_device *hid)
{
return 0;
Expand Down

0 comments on commit 5894e3b

Please sign in to comment.