diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 20:20:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 20:20:23 -0700 |
| commit | 99262a3dafa3290866512ddfb32609198f8973e9 (patch) | |
| tree | 6f74764150cd9c38d9ffacbeb5054b696537e154 /net | |
| parent | bf67f3a5c456a18f2e8d062f7e88506ef2cd9837 (diff) | |
| parent | c6190804f1dc5357b57825f0491eb31fc9ccf130 (diff) | |
| download | renesas_kernel-99262a3dafa3290866512ddfb32609198f8973e9.tar.gz renesas_kernel-99262a3dafa3290866512ddfb32609198f8973e9.tar.bz2 renesas_kernel-99262a3dafa3290866512ddfb32609198f8973e9.zip | |
Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
Pull virtio updates from Rusty Russell.
* tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
virtio: fix typo in comment
virtio-mmio: Devices parameter parsing
virtio_blk: Drop unused request tracking list
virtio-blk: Fix hot-unplug race in remove method
virtio: Use ida to allocate virtio index
virtio: balloon: separate out common code between remove and freeze functions
virtio: balloon: drop restore_common()
9p: disconnect channel when PCI device is removed
virtio: update documentation to v0.9.5 of spec
Diffstat (limited to 'net')
| -rw-r--r-- | net/9p/trans_virtio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 3d432068f62..5af18d11b51 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -615,7 +615,8 @@ static void p9_virtio_remove(struct virtio_device *vdev) { struct virtio_chan *chan = vdev->priv; - BUG_ON(chan->inuse); + if (chan->inuse) + p9_virtio_close(chan->client); vdev->config->del_vqs(vdev); mutex_lock(&virtio_9p_lock); |