From ea140a47d877fe3b1a6a15fce280fa4f9fd2365f Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:55:07 -0700 Subject: [PATCH] --- yaml --- r: 249523 b: refs/heads/master c: f1f66f8f0cb412b70838b1b4d8b03f953e09dd8c h: refs/heads/master i: 249521: 277f551afa8bc8f937c481db881e7e3a4c2a4d3e 249519: 02d6b522a8a1368d13572481ce6e0d1c6fda0ca5 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/hv_mouse.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2a9a5c7f1f1a..d261a66a0ab9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1f01b3e1738312f7e685c1b0c9023e91d4dc240 +refs/heads/master: f1f66f8f0cb412b70838b1b4d8b03f953e09dd8c diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c index 43f515870285..b7016e2faffd 100644 --- a/trunk/drivers/staging/hv/hv_mouse.c +++ b/trunk/drivers/staging/hv/hv_mouse.c @@ -859,9 +859,6 @@ static int mousevsc_remove(struct hv_device *dev) { int ret = 0; - struct mousevsc_drv_obj *mousevsc_drv_obj = - drv_to_mousedrv(dev->device.driver); - struct input_device_context *input_dev_ctx; input_dev_ctx = kmalloc(sizeof(struct input_device_context), @@ -874,14 +871,11 @@ static int mousevsc_remove(struct hv_device *dev) input_dev_ctx->connected = 0; } - if (!mousevsc_drv_obj->base.dev_rm) - return -1; - /* * Call to the vsc driver to let it know that the device * is being removed */ - ret = mousevsc_drv_obj->base.dev_rm(dev); + ret = mousevsc_on_device_remove(dev); if (ret != 0) { DPRINT_ERR(INPUTVSC_DRV,