2008-03-20 01:35:36

by Anthony Liguori

Subject: [PATCH] virtio_pci: unregister virtio device at device remove

Make sure to call unregister_virtio_device() when a virtio device is removed.
Otherwise, virtio_pci.ko cannot be rmmod'd.

This was spotted by Marcelo Tosatti.

Signed-off-by: Anthony Liguori <[email protected]>

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 59a8f73..6c8ecde 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -388,6 +388,7 @@ static void __devexit virtio_pci_remove(struct pci_dev *pci_dev)
{
struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);

+ unregister_virtio_device(&vp_dev->vdev);
free_irq(pci_dev->irq, vp_dev);
pci_set_drvdata(pci_dev, NULL);
pci_iounmap(pci_dev, vp_dev->ioaddr);

2008-03-20 05:47:43

by Rusty Russell

Subject: Re: [PATCH] virtio_pci: unregister virtio device at device remove

On Thursday 20 March 2008 12:35:04 Anthony Liguori wrote:
> Make sure to call unregister_virtio_device() when a virtio device is
> removed. Otherwise, virtio_pci.ko cannot be rmmod'd.
>
> This was spotted by Marcelo Tosatti.
>
> Signed-off-by: Anthony Liguori <[email protected]>

Thanks, applied.

Rusty.