diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-08 12:22:30 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-08 12:22:30 +1100 |
| commit | 124b69b6cc1020fff589312c62fcaf360abd8d12 (patch) | |
| tree | ebdab32b8cde3f1213f7a53643c5d8e7881bdd9b /drivers | |
| parent | bb5204c2eb27cc4abed7f7ae3baa9f4388d9302b (diff) | |
| parent | aded024a12b32fc1ed9a80639681daae2d07ec25 (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull virtio fix from Rusty Russell:
"Obviously I forgot to push this before linux.conf.au..."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
virtio_console: Don't access uninitialized data.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/virtio_console.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 684b0d53764f..ee4dbeafb377 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -2062,7 +2062,8 @@ static void virtcons_remove(struct virtio_device *vdev) /* Disable interrupts for vqs */ vdev->config->reset(vdev); /* Finish up work that's lined up */ - cancel_work_sync(&portdev->control_work); + if (use_multiport(portdev)) + cancel_work_sync(&portdev->control_work); list_for_each_entry_safe(port, port2, &portdev->ports, list) unplug_port(port); |