aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2006-08-06 22:22:23 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-08-06 21:44:48 +0100
commit916f3ac680fcc4c142e9acd46161f55533b11760 (patch)
tree849b825e4e043ed2207f03bcee222a95244e85ce
parent[ARM] 3744/1: MMC: mmcqd gets stuck when block queue is plugged (diff)
downloadlinux-dev-916f3ac680fcc4c142e9acd46161f55533b11760.tar.xz
linux-dev-916f3ac680fcc4c142e9acd46161f55533b11760.zip
[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>
-rw-r--r--drivers/mmc/wbsd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 8a30ef3ae419..ce86887ed3bd 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -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;
}