sunvdc: fix module unload/reload

Free resources allocated during port/disk probing so that the module may be
successfully reloaded after unloading.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 0ebadf93b6c5610cb0d7e46edcbdfa040719c199..089ff9035de6ae40ce0be534c49ff36e1684377e 100644 (file)
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -896,8 +896,19 @@ static int vdc_port_remove(struct vio_dev *vdev)
        struct vdc_port *port = dev_get_drvdata(&vdev->dev);
 
        if (port) {
+               unsigned long flags;
+
+               spin_lock_irqsave(&port->vio.lock, flags);
+               blk_stop_queue(port->disk->queue);
+               spin_unlock_irqrestore(&port->vio.lock, flags);
+
                del_timer_sync(&port->vio.timer);
 
+               del_gendisk(port->disk);
+               blk_cleanup_queue(port->disk->queue);
+               put_disk(port->disk);
+               port->disk = NULL;
+
                vdc_free_tx_ring(port);
                vio_ldc_free(&port->vio);