diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-21 09:58:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-21 09:58:42 -0700 |
| commit | 83425eee85c6235392e3fe865faf533a48b60ab3 (patch) | |
| tree | e97a28eb4c8c8440c3beef6a6ee0c3dc2c6a2938 /drivers/char | |
| parent | 8ed54bd5657b75e654c5913bcc5c680485a531b6 (diff) | |
| parent | afa2689e19073cd2e762d0f2c1358fab1ab9f18c (diff) | |
| download | linux-83425eee85c6235392e3fe865faf533a48b60ab3.tar.gz linux-83425eee85c6235392e3fe865faf533a48b60ab3.tar.bz2 linux-83425eee85c6235392e3fe865faf533a48b60ab3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
virtio: console: Enable call to hvc_remove() on console port remove
virtio_pci: Prevent double-free of pci regions after device hot-unplug
virtio: Decrement avail idx on buffer detach
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/virtio_console.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 84b164d1eb2b..838568a7dbf5 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1280,18 +1280,7 @@ static void unplug_port(struct port *port) spin_lock_irq(&pdrvdata_lock); list_del(&port->cons.list); spin_unlock_irq(&pdrvdata_lock); -#if 0 - /* - * hvc_remove() not called as removing one hvc port - * results in other hvc ports getting frozen. - * - * Once this is resolved in hvc, this functionality - * will be enabled. Till that is done, the -EPIPE - * return from get_chars() above will help - * hvc_console.c to clean up on ports we remove here. - */ hvc_remove(port->cons.hvc); -#endif } /* Remove unused data this port might have received. */ |