From 4a375413681f8368a4413016c6d82dadcce8030e Mon Sep 17 00:00:00 2001 From: Maxim Shchetynin Date: Thu, 23 Aug 2007 03:01:28 +1000 Subject: [PATCH] --- yaml --- r: 64462 b: refs/heads/master c: b0e81ebb1062eba20fbcbe459662c0a6ec6075f7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/axonram.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 565739497dea..548d93910461 100644 --- 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 index eabbf82fda3a..ab037a3a40db 100644 --- 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);