]> err.no Git - linux-2.6/commitdiff
[MMC] Fix base address configuration in wbsd
authorPierre Ossman <drzeus@drzeus.cx>
Sun, 6 Aug 2006 20:22:23 +0000 (22:22 +0200)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Aug 2006 20:44:48 +0000 (21:44 +0100)
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>
drivers/mmc/wbsd.c

index 8a30ef3ae4191d52320516ae72b93c75f47a6aac..ce86887ed3bdd337268ed98781d733875d3f961f 100644 (file)
@@ -41,7 +41,7 @@
 #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 wbsd_host *host)
 
 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;
 }