From b565a3906a92fe87b162cdcd11268589a36dc6dd Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Wed, 16 May 2012 13:50:13 -0700 Subject: HID: hyperv: Set the hid drvdata correctly Set the hid drvdata prior to invoking hid_add_device() as hid_add_device() expects this state to be set. This bug was introduced in the recent hid changes that were made in 07d9ab4f0e52cb ("HID: hid-hyperv: Do not use hid_parse_report() directly"). Signed-off-by: K. Y. Srinivasan Reviewed-by: Haiyang Zhang Signed-off-by: Jiri Kosina --- drivers/hid/hid-hyperv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/hid/hid-hyperv.c') diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c index 032e6c07982..3d62781b899 100644 --- a/drivers/hid/hid-hyperv.c +++ b/drivers/hid/hid-hyperv.c @@ -516,11 +516,12 @@ static int mousevsc_probe(struct hv_device *device, sprintf(hid_dev->name, "%s", "Microsoft Vmbus HID-compliant Mouse"); + hid_set_drvdata(hid_dev, device); + ret = hid_add_device(hid_dev); if (ret) goto probe_err1; - hid_set_drvdata(hid_dev, device); ret = hid_parse(hid_dev); if (ret) { -- cgit v1.2.3