summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2008-02-13 03:56:59 +0000
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-13 08:16:35 -0800
commit282ea441e003f2886893ab7bb60bfe29399ef7be (patch)
tree27cd6ec7492f14201250f1c2a81d203f317cc1d4 /drivers/memstick
parent39ed7adb17bdec8224bd3fae551bb7222e05f35b (diff)
downloadop-kernel-dev-282ea441e003f2886893ab7bb60bfe29399ef7be.zip
op-kernel-dev-282ea441e003f2886893ab7bb60bfe29399ef7be.tar.gz
drivers/memstick/host/tifm_ms.c breakage
writel(sock + ...) that should've been writel(sock->addr + ...) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/memstick')
-rw-r--r--drivers/memstick/host/tifm_ms.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c
index f55b71a..4fb2421 100644
--- a/drivers/memstick/host/tifm_ms.c
+++ b/drivers/memstick/host/tifm_ms.c
@@ -282,7 +282,7 @@ static int tifm_ms_issue_cmd(struct tifm_ms *host)
writel(TIFM_MS_SYS_LATCH
| readl(sock->addr + SOCK_MS_SYSTEM),
- sock + SOCK_MS_SYSTEM);
+ sock->addr + SOCK_MS_SYSTEM);
writel(0, sock->addr + SOCK_MS_DATA);
dev_dbg(&sock->dev, "writing %x\n", 0);
OpenPOWER on IntegriCloud