diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-20 11:48:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-20 11:48:56 +0200 |
| commit | 40a2ea1bd988e3bbdb07a0708681fdb05cd7d267 (patch) | |
| tree | 05806aaa27a4b0516a14a8ccf703c1501500e588 /drivers/virtio/virtio_input.c | |
| parent | a897b5f0393a8a05d230c9248dc5324fb30720a0 (diff) | |
| parent | 196676497f2507966f99abef63bede6a8550f8b3 (diff) | |
| download | linux-40a2ea1bd988e3bbdb07a0708681fdb05cd7d267.tar.gz linux-40a2ea1bd988e3bbdb07a0708681fdb05cd7d267.tar.bz2 linux-40a2ea1bd988e3bbdb07a0708681fdb05cd7d267.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes before adding more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/virtio/virtio_input.c')
| -rw-r--r-- | drivers/virtio/virtio_input.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_input.c b/drivers/virtio/virtio_input.c index 60e2a1677563..c96944b59856 100644 --- a/drivers/virtio/virtio_input.c +++ b/drivers/virtio/virtio_input.c @@ -313,6 +313,7 @@ err_init_vq: static void virtinput_remove(struct virtio_device *vdev) { struct virtio_input *vi = vdev->priv; + void *buf; unsigned long flags; spin_lock_irqsave(&vi->lock, flags); @@ -320,6 +321,9 @@ static void virtinput_remove(struct virtio_device *vdev) spin_unlock_irqrestore(&vi->lock, flags); input_unregister_device(vi->idev); + vdev->config->reset(vdev); + while ((buf = virtqueue_detach_unused_buf(vi->sts)) != NULL) + kfree(buf); vdev->config->del_vqs(vdev); kfree(vi); } |