Skip to content

Commit

Permalink
[POWERPC] axonram: Do not delete gendisks queue in error path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Maxim Shchetynin authored and Paul Mackerras committed Aug 25, 2007
1 parent fedcd2c commit b0e81eb
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions arch/powerpc/sysdev/axonram.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,6 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b0e81eb

Please sign in to comment.