Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / drivers / staging / hv / hv_mouse.c

diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 9c6d4d2..118c7be 100644 (file)
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -14,6 +14,7 @@
  */
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/workqueue.h>
 #include <linux/sched.h>
@@ -375,7 +376,7 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
               desc->desc[0].wDescriptorLength);
 
        /* Send the ack */
-       memset(&ack, sizeof(struct mousevsc_prt_msg), 0);
+       memset(&ack, 0, sizeof(struct mousevsc_prt_msg));
 
        ack.type = PipeMessageData;
        ack.size = sizeof(struct synthhid_device_info_ack);
@@ -596,7 +597,7 @@ static int MousevscConnectToVsp(struct hv_device *Device)
        /*
         * Now, initiate the vsc/vsp initialization protocol on the open channel
         */
-       memset(request, sizeof(struct mousevsc_prt_msg), 0);
+       memset(request, 0, sizeof(struct mousevsc_prt_msg));
 
        request->type = PipeMessageData;
        request->size = sizeof(struct synthhid_protocol_request);