[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: 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:
		
				
					committed by
					
						
						Paul Mackerras
					
				
			
			
				
	
			
			
			
						parent
						
							fedcd2c53d
						
					
				
				
					commit
					b0e81ebb10
				
			@@ -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);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user