commit 282ea441e003f2886893ab7bb60bfe29399ef7be
author Al Viro <viro@ZenIV.linux.org.uk> Wed Feb 13 03:56:59 2008 +0000
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Feb 13 08:16:35 2008 -0800
tree 27cd6ec7492f14201250f1c2a81d203f317cc1d4
parent 39ed7adb17bdec8224bd3fae551bb7222e05f35b

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>

drivers/memstick/host/tifm_ms.c

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 @@
 
 			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);