Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236230
b: refs/heads/master
c: e8290f9
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Mar 3, 2011
1 parent e1daa54 commit 66fc206
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 76e63665c338069085c4e0ca1b2093dc26258d7a
refs/heads/master: e8290f9f73f9a53fbeffd8de8e30cafb41475ae2
10 changes: 4 additions & 6 deletions trunk/drivers/staging/hv/hv_mouse_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include <linux/pci.h>
#include <linux/dmi.h>

//#include "osd.h"
#include "hv_api.h"
#include "logging.h"
#include "version_info.h"
Expand Down Expand Up @@ -152,9 +151,8 @@ int mousevsc_remove(struct device *device)
input_dev_ctx->connected = 0;
}

if (!mousevsc_drv_obj->Base.dev_rm) {
if (!mousevsc_drv_obj->Base.dev_rm)
return -1;
}

/*
* Call to the vsc driver to let it know that the device
Expand Down Expand Up @@ -238,8 +236,6 @@ int mousevsc_drv_init(int (*pfn_drv_init)(struct hv_driver *pfn_drv_init))
struct mousevsc_drv_obj *input_drv_obj = &g_mousevsc_drv.drv_obj;
struct driver_context *drv_ctx = &g_mousevsc_drv.drv_ctx;

// vmbus_get_interface(&input_drv_obj->Base.VmbusChannelInterface);

input_drv_obj->OnDeviceInfo = mousevsc_deviceinfo_callback;
input_drv_obj->OnInputReport = mousevsc_inputreport_callback;
input_drv_obj->OnReportDescriptor = mousevsc_reportdesc_callback;
Expand Down Expand Up @@ -281,7 +277,9 @@ void mousevsc_drv_exit(void)
current_dev = NULL;

/* Get the device */
ret = driver_for_each_device(&drv_ctx->driver, NULL, (void *)&current_dev, mousevsc_drv_exit_cb);
ret = driver_for_each_device(&drv_ctx->driver, NULL,
(void *)&current_dev,
mousevsc_drv_exit_cb);
if (ret)
printk(KERN_ERR "Can't find mouse device!\n");

Expand Down

0 comments on commit 66fc206

Please sign in to comment.