---

yaml --- r: 64462 b: refs/heads/master c: b0e81eb h: refs/heads/master v: v3
git-mirror · Aug 25, 2007 · 4a37541 · 4a37541
1 parent 43d6057
commit 4a37541
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fedcd2c53d838e7a69df699ce2a14e45d34d7f7f
+refs/heads/master: b0e81ebb1062eba20fbcbe459662c0a6ec6075f7
diff --git a/trunk/arch/powerpc/sysdev/axonram.c b/trunk/arch/powerpc/sysdev/axonram.c
@@ -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);