Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236257
b: refs/heads/master
c: 2012d40
h: refs/heads/master
i:
  236255: c7ca0c6
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Mar 3, 2011
1 parent 686fe79 commit a6620c5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d7fa1a4629cd94e249b1556f58030174601ddbc4
refs/heads/master: 2012d40dbda6f87537535bad38ccd84f8805de9e
12 changes: 6 additions & 6 deletions trunk/drivers/staging/hv/hv_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ enum pipe_prot_msg_type {


struct pipe_prt_msg {
enum pipe_prot_msg_type PacketType;
enum pipe_prot_msg_type type;
u32 DataSize;
char Data[1];
};
Expand All @@ -154,7 +154,7 @@ struct pipe_prt_msg {
* Data types
*/
struct mousevsc_prt_msg {
enum pipe_prot_msg_type PacketType;
enum pipe_prot_msg_type type;
u32 DataSize;
union {
struct synthhid_protocol_request Request;
Expand Down Expand Up @@ -382,7 +382,7 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
/* Send the ack */
memset(&ack, sizeof(struct mousevsc_prt_msg), 0);

ack.PacketType = PipeMessageData;
ack.type = PipeMessageData;
ack.DataSize = sizeof(struct synthhid_device_info_ack);

ack.Ack.header.type = SynthHidInitialDeviceInfoAck;
Expand Down Expand Up @@ -453,9 +453,9 @@ static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descript

pipeMsg = (struct pipe_prt_msg *)((unsigned long)Packet + (Packet->offset8 << 3));

if (pipeMsg->PacketType != PipeMessageData) {
if (pipeMsg->type != PipeMessageData) {
pr_err("unknown pipe msg type - type %d len %d",
pipeMsg->PacketType, pipeMsg->DataSize);
pipeMsg->type, pipeMsg->DataSize);
PutInputDevice(Device);
return ;
}
Expand Down Expand Up @@ -605,7 +605,7 @@ static int MousevscConnectToVsp(struct hv_device *Device)
*/
memset(request, sizeof(struct mousevsc_prt_msg), 0);

request->PacketType = PipeMessageData;
request->type = PipeMessageData;
request->DataSize = sizeof(struct synthhid_protocol_request);

request->Request.header.type = SynthHidProtocolRequest;
Expand Down

0 comments on commit a6620c5

Please sign in to comment.