Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268661
b: refs/heads/master
c: 0b1f0da
h: refs/heads/master
i:
  268659: 7834fee
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Oct 4, 2011
1 parent 702e9ba commit 8a36167
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 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: da5969e4cce5cbb44ca4597c7ff60bf6517ba00b
refs/heads/master: 0b1f0da005928c1cc761c320e6919b719a090a07
18 changes: 3 additions & 15 deletions trunk/drivers/staging/hv/hv_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -665,10 +665,8 @@ static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len)
hid_dev->ll_driver = &mousevsc_ll_driver;
hid_dev->driver = &mousevsc_hid_driver;

if (hid_parse_report(hid_dev, packet, len)) {
DPRINT_INFO(INPUTVSC_DRV, "Unable to call hd_parse_report");
if (hid_parse_report(hid_dev, packet, len))
return;
}

hid_dev->bus = BUS_VIRTUAL;
hid_dev->vendor = input_device->hid_dev_info.vendor;
Expand Down Expand Up @@ -797,19 +795,15 @@ static int mousevsc_probe(struct hv_device *dev,
/* Call to the vsc driver to add the device */
ret = mousevsc_on_device_add(dev, NULL);

if (ret != 0) {
DPRINT_ERR(INPUTVSC_DRV, "unable to add input vsc device");

if (ret != 0)
return -1;
}

return 0;
}

static int mousevsc_remove(struct hv_device *dev)
{
struct mousevsc_dev *input_dev = hv_get_drvdata(dev);
int ret;

if (input_dev->connected) {
hidinput_disconnect(input_dev->hid_device);
Expand All @@ -821,13 +815,7 @@ static int mousevsc_remove(struct hv_device *dev)
* Call to the vsc driver to let it know that the device
* is being removed
*/
ret = mousevsc_on_device_remove(dev);
if (ret != 0) {
DPRINT_ERR(INPUTVSC_DRV,
"unable to remove vsc device (ret %d)", ret);
}

return ret;
return mousevsc_on_device_remove(dev);
}

static const struct hv_vmbus_device_id id_table[] = {
Expand Down

0 comments on commit 8a36167

Please sign in to comment.