Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0e81ebb authored by Maxim Shchetynin's avatar Maxim Shchetynin Committed by Paul Mackerras
Browse files

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



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: default avatarMaximilian <maxim@de.ibm.com>
Signed-off-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent fedcd2c5

arch/powerpc/sysdev/axonram.c

+0 −3
Original line number Diff line number Diff line
@@ -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);
@@ -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);