diff --git a/[refs] b/[refs]
index 1e30e97d6c94..0dd062452a0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98ad91ed32f6d9327b630f11315a40097e7897b2
+refs/heads/master: 18bc44e333f9f278328eab851f27d1169d623efb
diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c
index 2ed67d93aed5..90badf69e88a 100644
--- a/trunk/drivers/staging/hv/hv_mouse.c
+++ b/trunk/drivers/staging/hv/hv_mouse.c
@@ -117,7 +117,7 @@ struct synthhid_protocol_response {
 struct synthhid_device_info {
 	struct synthhid_msg_hdr header;
 	struct hv_input_dev_info hid_dev_info;
-	unsigned char               HidDescriptorInformation[1];
+	struct hid_descriptor hid_descriptor;
 };
 
 struct synthhid_device_info_ack {
@@ -352,7 +352,7 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
 	memcpy(&InputDevice->hid_dev_info, &DeviceInfo->hid_dev_info, sizeof(struct hv_input_dev_info));
 
 	/* Save the hid desc */
-	desc = (struct hid_descriptor *)DeviceInfo->HidDescriptorInformation;
+	desc = &DeviceInfo->hid_descriptor;
 	WARN_ON(desc->bLength > 0);
 
 	InputDevice->HidDesc = kzalloc(desc->bLength, GFP_KERNEL);