Re: 2.5.46: drivers/mtd/mtdblock.c won't compile -- misordered declaration

[Russell King]

On Tue, Nov 05, 2002 at 01:45:22PM +0900, Miles Bader wrote:
> [This is a repost of my earlier message, since the problem doesn't seem
>  to have been fixed in 2.5.46; could someone please look at this?
>  I don't think it should be controversial...]
> 
> When I compile 2.5.45, I get the following errors:

It'll be fixed in 2.5.47 - Linus has already incorporated the following.
I just missed 2.5.46 by a few hours (because I normally send my requests
to Linus at around 11pm - Midnight GMT.)

# --------------------------------------------
# 02/11/04	[e-mail]	1.896
# [MTD] Fix mtdblock.c build error
# Move spin_unlock_irq() down one line.
# --------------------------------------------
diff -Nru a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
--- a/drivers/mtd/mtdblock.c	Mon Nov  4 22:56:17 2002
+++ b/drivers/mtd/mtdblock.c	Mon Nov  4 22:56:17 2002
@@ -394,8 +394,8 @@
 
 	while (!blk_queue_empty(&mtd_queue)) {
 		struct request *req = elv_next_request(&mtd_queue);
-		spin_unlock_irq(mtd_queue.queue_lock);
 		struct mtdblk_dev **p = req->rq_disk->private_data;
+		spin_unlock_irq(mtd_queue.queue_lock);
 		mtdblk = *p;
 		res = 0;
 

-- 
Russell King ([e-mail])                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html