From edee3af91462ed74ef721896f1cc5b5dd7f275a8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 25 Aug 2011 16:51:28 -0700 Subject: [PATCH] --- yaml --- r: 267979 b: refs/heads/master c: 6a180978aea7cb231c60b69b078ec339f40e2faa h: refs/heads/master i: 267977: 5894e3b7292d68801f8ab02f4506e3fe7847754a 267975: 37f693e7ba835b075f91e0d54d79a7f5198b514b v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/hv_mouse.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 7dea29b7db81..2f99ef723446 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ab0871ddd1bfdc514f93472cfd68290ecdb62c0 +refs/heads/master: 6a180978aea7cb231c60b69b078ec339f40e2faa diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c index 083f28f7abdd..090736af8dff 100644 --- a/trunk/drivers/staging/hv/hv_mouse.c +++ b/trunk/drivers/staging/hv/hv_mouse.c @@ -847,15 +847,10 @@ static int mousevsc_probe(struct hv_device *dev) static int mousevsc_remove(struct hv_device *dev) { - int ret = 0; - struct input_device_context *input_dev_ctx; + int ret; - input_dev_ctx = kmalloc(sizeof(struct input_device_context), - GFP_KERNEL); - - dev_set_drvdata(&dev->device, input_dev_ctx); - + input_dev_ctx = dev_get_drvdata(&dev->device); if (input_dev_ctx->connected) { hidinput_disconnect(input_dev_ctx->hid_device); input_dev_ctx->connected = 0; @@ -866,7 +861,6 @@ static int mousevsc_remove(struct hv_device *dev) * is being removed */ ret = mousevsc_on_device_remove(dev); - if (ret != 0) { DPRINT_ERR(INPUTVSC_DRV, "unable to remove vsc device (ret %d)", ret);