From: K. Y. Srinivasan Date: Thu, 29 Sep 2011 18:54:41 +0000 (-0700) Subject: Staging: hv: mousevsc: Fixup struct hv_input_dev_info X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=870e53adbd372cbeea15ed00e1d4423725f3cea0;p=linux-beck.git Staging: hv: mousevsc: Fixup struct hv_input_dev_info This structure is protocol defined structure and must match the definition on the host side. Make appropriate adjustments. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c index fcb023af4b3e..44a2b23cc533 100644 --- a/drivers/staging/hv/hv_mouse.c +++ b/drivers/staging/hv/hv_mouse.c @@ -30,10 +30,11 @@ * Data types */ struct hv_input_dev_info { + unsigned int size; unsigned short vendor; unsigned short product; unsigned short version; - char name[128]; + unsigned short reserved[11]; }; /* The maximum size of a synthetic input message. */ @@ -686,7 +687,7 @@ static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len) hid_dev->dev = dev->device; sprintf(hid_dev->name, "%s", - input_device_ctx->device_info.name); + "Microsoft Vmbus HID-compliant Mouse"); /* * HJ Do we want to call it with a 0 @@ -763,7 +764,6 @@ static int mousevsc_on_device_add(struct hv_device *device, dev_info.vendor = input_dev->hid_dev_info.vendor; dev_info.product = input_dev->hid_dev_info.product; dev_info.version = input_dev->hid_dev_info.version; - strcpy(dev_info.name, "Microsoft Vmbus HID-compliant Mouse"); /* Send the device info back up */ input_device_ctx = dev_get_drvdata(&device->device);