Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236231
b: refs/heads/master
c: 16ecf02
h: refs/heads/master
i:
  236229: e1daa54
  236227: 40747f9
  236223: 2a5ac4f
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Mar 3, 2011
1 parent 66fc206 commit 88c9a09
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 20 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: e8290f9f73f9a53fbeffd8de8e30cafb41475ae2
refs/heads/master: 16ecf02095bbd7f69539844dc15038359e4a29d3
30 changes: 11 additions & 19 deletions trunk/drivers/staging/hv/mouse_vsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,14 @@
#include "vmbus_hid_protocol.h"


enum pipe_prot_msg_type
{
enum pipe_prot_msg_type {
PipeMessageInvalid = 0,
PipeMessageData,
PipeMessageMaximum
};


struct pipe_prt_msg
{
struct pipe_prt_msg {
enum pipe_prot_msg_type PacketType;
u32 DataSize;
char Data[1];
Expand Down Expand Up @@ -447,8 +445,7 @@ MousevscOnDeviceRemove(struct hv_device *Device)
*
* so that outstanding requests can be completed.
*/
while (inputDevice->NumOutstandingRequests)
{
while (inputDevice->NumOutstandingRequests) {
pr_info("waiting for %d requests to complete...", inputDevice->NumOutstandingRequests);

udelay(100);
Expand Down Expand Up @@ -497,9 +494,9 @@ MousevscOnSendCompletion(struct hv_device *Device,

request = (void*)(unsigned long *) Packet->trans_id;

if (request == &inputDevice->ProtocolReq)
{

if (request == &inputDevice->ProtocolReq) {
/* FIXME */
/* Shouldn't we be doing something here? */
}

PutInputDevice(Device);
Expand Down Expand Up @@ -577,14 +574,12 @@ MousevscOnReceiveDeviceInfo(
return;

Cleanup:
if (InputDevice->HidDesc)
{
if (InputDevice->HidDesc) {
kfree(InputDevice->HidDesc);
InputDevice->HidDesc = NULL;
}

if (InputDevice->ReportDesc)
{
if (InputDevice->ReportDesc) {
kfree(InputDevice->ReportDesc);
InputDevice->ReportDesc = NULL;
}
Expand All @@ -603,8 +598,7 @@ MousevscOnReceiveInputReport(
{
struct mousevsc_drv_obj *inputDriver;

if (!InputDevice->bInitializeComplete)
{
if (!InputDevice->bInitializeComplete) {
pr_info("Initialization incomplete...ignoring InputReport msg");
return;
}
Expand All @@ -624,8 +618,7 @@ MousevscOnReceive(struct hv_device *Device, struct vmpacket_descriptor *Packet)
struct mousevsc_dev *inputDevice;

inputDevice = MustGetInputDevice(Device);
if (!inputDevice)
{
if (!inputDevice) {
pr_err("unable to get input device...device being destroyed?");
return;
}
Expand Down Expand Up @@ -700,8 +693,7 @@ void MousevscOnChannelCallback(void *Context)
if (bytesRecvd > 0) {
desc = (struct vmpacket_descriptor *)buffer;

switch (desc->type)
{
switch (desc->type) {
case VM_PKT_COMP:
MousevscOnSendCompletion(device,
desc);
Expand Down

0 comments on commit 88c9a09

Please sign in to comment.