GIT dd2c609c59cd9daeb90d58f3d1bc3813e8987df1 git+ssh://master.kernel.org/home/rmk/linux-2.6-mmc.git

commit dd2c609c59cd9daeb90d58f3d1bc3813e8987df1
Author: Pierre Ossman <drzeus@drzeus.cx>
Date:   Mon Aug 7 01:40:04 2006 +0200

    [MMC] Another stray 'io' reference
    
    Another misuse of the global 'io' variable instead of the local 'base'.
    
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 916f3ac680fcc4c142e9acd46161f55533b11760
Author: Pierre Ossman <drzeus@drzeus.cx>
Date:   Sun Aug 6 22:22:23 2006 +0200

    [MMC] Fix base address configuration in wbsd
    
    There were some confusion about base I/O variables in the wbsd driver.
    Seems like things have been working on shear luck so far. The global 'io'
    variable (used when manually configuring the resources) was used instead of
    the local 'base' variable.
    
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit c723e08af18e60cda3bbc90e0d6fb688587aeb9f
Author: Juha [êölä <juha.yrjola@solidboot.com>
Date:   Sun Aug 6 09:58:22 2006 +0100

    [ARM] 3744/1: MMC: mmcqd gets stuck when block queue is plugged
    
    Patch from Juha [êölä
    
    When the block queue is plugged, mq->req must be set to NULL.
    Otherwise mq->req might be left non-NULL, even though mmcqd is
    not processing a request, thus preventing the MMC queue thread from
    being woken up when new requests do arrive.
    
    Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/mmc_queue.c
index 0b9682e..74f8cde 100644
--- a/drivers/mmc/mmc_queue.c
+++ b/drivers/mmc/mmc_queue.c
@@ -79,7 +79,8 @@ static int mmc_queue_thread(void *d)
 		spin_lock_irq(q->queue_lock);
 		set_current_state(TASK_INTERRUPTIBLE);
 		if (!blk_queue_plugged(q))
-			mq->req = req = elv_next_request(q);
+			req = elv_next_request(q);
+		mq->req = req;
 		spin_unlock_irq(q->queue_lock);
 
 		if (!req) {
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 8a30ef3..c351c6d 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -41,7 +41,7 @@ #include <asm/scatterlist.h>
 #include "wbsd.h"
 
 #define DRIVER_NAME "wbsd"
-#define DRIVER_VERSION "1.5"
+#define DRIVER_VERSION "1.6"
 
 #define DBG(x...) \
 	pr_debug(DRIVER_NAME ": " x)
@@ -1439,13 +1439,13 @@ static int __devinit wbsd_scan(struct wb
 
 static int __devinit wbsd_request_region(struct wbsd_host *host, int base)
 {
-	if (io & 0x7)
+	if (base & 0x7)
 		return -EINVAL;
 
 	if (!request_region(base, 8, DRIVER_NAME))
 		return -EIO;
 
-	host->base = io;
+	host->base = base;
 
 	return 0;
 }
@@ -1773,7 +1773,7 @@ static int __devinit wbsd_init(struct de
 	/*
 	 * Request resources.
 	 */
-	ret = wbsd_request_resources(host, io, irq, dma);
+	ret = wbsd_request_resources(host, base, irq, dma);
 	if (ret) {
 		wbsd_release_resources(host);
 		wbsd_free_mmc(dev);
@@ -1861,6 +1861,7 @@ static void __devexit wbsd_shutdown(stru
 
 static int __devinit wbsd_probe(struct platform_device *dev)
 {
+	/* Use the module parameters for resources */
 	return wbsd_init(&dev->dev, io, irq, dma, 0);
 }