diff --git a/[refs] b/[refs] index d3f519eb04ae..ded4e725f4a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8e4c77277ca5db0c4ddbfb4bc628b8abad585b0 +refs/heads/master: 54f9e36cb83e7da17dc0596d365fe019a25c226f diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c index 26393a606e6f..5629e397520d 100644 --- a/trunk/drivers/input/input.c +++ b/trunk/drivers/input/input.c @@ -1024,14 +1024,8 @@ EXPORT_SYMBOL(input_allocate_device); */ void input_free_device(struct input_dev *dev) { - if (dev) { - - mutex_lock(&dev->mutex); - dev->name = dev->phys = dev->uniq = NULL; - mutex_unlock(&dev->mutex); - + if (dev) input_put_device(dev); - } } EXPORT_SYMBOL(input_free_device);