diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2012-04-22 08:21:38 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-01 06:54:53 -0400 |
commit | 07d9ab4f0e52cb2a383596e5ebbbd20232501393 (patch) | |
tree | 0a7158ec9b3ccefcaae444e841df84ec8bb105e2 /drivers/hid/hid-hyperv.c | |
parent | 73bebc8bafb6a880a4db63d60bc4b8d9d6879c9e (diff) |
HID: hid-hyperv: Do not use hid_parse_report() directly
Upcoming changes will split the semantics of hid_parse_report()
and hid_parse(), so make sure drivers use hid_parse() in probe().
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-hyperv.c')
-rw-r--r-- | drivers/hid/hid-hyperv.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c index 406632472c1b..032e6c079826 100644 --- a/drivers/hid/hid-hyperv.c +++ b/drivers/hid/hid-hyperv.c | |||
@@ -430,6 +430,15 @@ cleanup: | |||
430 | return ret; | 430 | return ret; |
431 | } | 431 | } |
432 | 432 | ||
433 | static int mousevsc_hid_parse(struct hid_device *hid) | ||
434 | { | ||
435 | struct hv_device *dev = hid_get_drvdata(hid); | ||
436 | struct mousevsc_dev *input_dev = hv_get_drvdata(dev); | ||
437 | |||
438 | return hid_parse_report(hid, input_dev->report_desc, | ||
439 | input_dev->report_desc_size); | ||
440 | } | ||
441 | |||
433 | static int mousevsc_hid_open(struct hid_device *hid) | 442 | static int mousevsc_hid_open(struct hid_device *hid) |
434 | { | 443 | { |
435 | return 0; | 444 | return 0; |
@@ -449,6 +458,7 @@ static void mousevsc_hid_stop(struct hid_device *hid) | |||
449 | } | 458 | } |
450 | 459 | ||
451 | static struct hid_ll_driver mousevsc_ll_driver = { | 460 | static struct hid_ll_driver mousevsc_ll_driver = { |
461 | .parse = mousevsc_hid_parse, | ||
452 | .open = mousevsc_hid_open, | 462 | .open = mousevsc_hid_open, |
453 | .close = mousevsc_hid_close, | 463 | .close = mousevsc_hid_close, |
454 | .start = mousevsc_hid_start, | 464 | .start = mousevsc_hid_start, |
@@ -510,9 +520,9 @@ static int mousevsc_probe(struct hv_device *device, | |||
510 | if (ret) | 520 | if (ret) |
511 | goto probe_err1; | 521 | goto probe_err1; |
512 | 522 | ||
513 | ret = hid_parse_report(hid_dev, input_dev->report_desc, | 523 | hid_set_drvdata(hid_dev, device); |
514 | input_dev->report_desc_size); | ||
515 | 524 | ||
525 | ret = hid_parse(hid_dev); | ||
516 | if (ret) { | 526 | if (ret) { |
517 | hid_err(hid_dev, "parse failed\n"); | 527 | hid_err(hid_dev, "parse failed\n"); |
518 | goto probe_err2; | 528 | goto probe_err2; |