aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-09-22 20:20:31 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 20:48:56 -0400
commit634965f5cfda1763f51e7916cfa49265b70e2a8d (patch)
treed8b1dce2b96fb7e63e558085f2a80eb369f62268 /drivers
parentcc9bd99e9adfa4f44ea050a63fb41a3f764acf84 (diff)
[PATCH] memcpy_fromio() missing in istallion
memcpy() from iomem is a bad thing... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/istallion.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 84dfc4278139..8c09997cc3d6 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -3488,7 +3488,7 @@ static int stli_initecp(stlibrd_t *brdp)
3488 */ 3488 */
3489 EBRDENABLE(brdp); 3489 EBRDENABLE(brdp);
3490 sigsp = (cdkecpsig_t __iomem *) EBRDGETMEMPTR(brdp, CDK_SIGADDR); 3490 sigsp = (cdkecpsig_t __iomem *) EBRDGETMEMPTR(brdp, CDK_SIGADDR);
3491 memcpy(&sig, sigsp, sizeof(cdkecpsig_t)); 3491 memcpy_fromio(&sig, sigsp, sizeof(cdkecpsig_t));
3492 EBRDDISABLE(brdp); 3492 EBRDDISABLE(brdp);
3493 3493
3494 if (sig.magic != cpu_to_le32(ECP_MAGIC)) 3494 if (sig.magic != cpu_to_le32(ECP_MAGIC))