lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] axonram: Do not delete gendisks queue in error path

Browse Source 
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 <maxim@de.ibm.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Maxim Shchetynin
2007-08-23 03:01:28 +10:00
committed by Paul Mackerras
parent fedcd2c53d
commit b0e81ebb10
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/sysdev/axonram.c
View File

@@ -281,8 +281,6 @@ failed:
if (bank->irq_id != NO_IRQ) if (bank->irq_id != NO_IRQ)
free_irq(bank->irq_id, device); free_irq(bank->irq_id, device);
if (bank->disk != NULL) { if (bank->disk != NULL) {
if (bank->disk->queue != NULL)
blk_cleanup_queue(bank->disk->queue);
if (bank->disk->major > 0) if (bank->disk->major > 0)
unregister_blkdev(bank->disk->major, unregister_blkdev(bank->disk->major,
bank->disk->disk_name); bank->disk->disk_name);
@@ -310,7 +308,6 @@ axon_ram_remove(struct of_device *device)
device_remove_file(&device->dev, &dev_attr_ecc); device_remove_file(&device->dev, &dev_attr_ecc);
free_irq(bank->irq_id, device); free_irq(bank->irq_id, device);
blk_cleanup_queue(bank->disk->queue);
unregister_blkdev(bank->disk->major, bank->disk->disk_name); unregister_blkdev(bank->disk->major, bank->disk->disk_name);
del_gendisk(bank->disk); del_gendisk(bank->disk);
iounmap((void __iomem *) bank->io_addr); iounmap((void __iomem *) bank->io_addr);