[patch 4/5] axonram: do not delete gendisks queue in error path
From: Arnd Bergmann <arnd@arndb.de>
Date: 2007-08-22 17:21:31
Also in:
lkml
From: Maxim Shchetynin <redacted> On exit do not delete gendisk's queue because this is already done by del_gendisk(). Doing it twice may cause memory damage. Signed-off-by: Maximilian <redacted> Signed-off-by: Arnd Bergmann <redacted> --- Index: linux-2.6/arch/powerpc/sysdev/axonram.c ===================================================================
--- linux-2.6.orig/arch/powerpc/sysdev/axonram.c
+++ linux-2.6/arch/powerpc/sysdev/axonram.c@@ -281,8 +281,6 @@ failed: if (bank->irq_id != NO_IRQ) free_irq(bank->irq_id, device); if (bank->disk != NULL) { - if (bank->disk->queue != NULL) - blk_cleanup_queue(bank->disk->queue); if (bank->disk->major > 0) unregister_blkdev(bank->disk->major, bank->disk->disk_name);
@@ -310,7 +308,6 @@ axon_ram_remove(struct of_device *device device_remove_file(&device->dev, &dev_attr_ecc); free_irq(bank->irq_id, device); - blk_cleanup_queue(bank->disk->queue); unregister_blkdev(bank->disk->major, bank->disk->disk_name); del_gendisk(bank->disk); iounmap((void __iomem *) bank->io_addr); --