diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-02-24 08:35:26 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-02-24 08:35:26 +0700 |
| commit | 6c5dadef809982e05b16ba7cf309e7c642a1b56a (patch) | |
| tree | 1524a508c2cdf116b160732d002179e7537b20a7 /drivers/char | |
| parent | ade046f9db4d92795249a3e3ce2b8cebf6dce0c7 (diff) | |
| parent | 21d69845e411bfcee426070af5416ddfba350529 (diff) | |
| download | kernel_samsung_aries-6c5dadef809982e05b16ba7cf309e7c642a1b56a.zip kernel_samsung_aries-6c5dadef809982e05b16ba7cf309e7c642a1b56a.tar.gz kernel_samsung_aries-6c5dadef809982e05b16ba7cf309e7c642a1b56a.tar.bz2 | |
Merge 3.0.66
Diffstat (limited to 'drivers/char')
| -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 fb68b12..a95256a 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1750,7 +1750,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); |