From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Wed, 13 Feb 2008 03:56:59 +0000 (+0000)
Subject: drivers/memstick/host/tifm_ms.c breakage
X-Git-Tag: v2.6.25-rc2~75
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=282ea441e003f2886893ab7bb60bfe29399ef7be;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c
index f55b71a4337..4fb24215bd9 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);