summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-04-26 07:43:42 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-26 07:43:42 -0700
commitf815e8182b94f8fb5913b66454b40b484a2f70cc (patch)
tree214d245b16a664f9f638cb1931df33110070e775
parent66768eb26c471091dc4ea1ed59b4bab7edc3d7bd (diff)
downloadop-kernel-dev-f815e8182b94f8fb5913b66454b40b484a2f70cc.zip
op-kernel-dev-f815e8182b94f8fb5913b66454b40b484a2f70cc.tar.gz
[PATCH] imsttfb missing iomem annotations
write_reg_le32() and read_reg_le32() expect iomem pointers... Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/imsttfb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 5a72ca3..7b9bf45 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -1287,12 +1287,12 @@ imsttfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
case FBIMSTT_SETCMAPREG:
if (copy_from_user(reg, argp, 8) || reg[0] > (0x1000 - sizeof(reg[0])) / sizeof(reg[0]))
return -EFAULT;
- write_reg_le32(((u_int *)par->cmap_regs), reg[0], reg[1]);
+ write_reg_le32(((u_int __iomem *)par->cmap_regs), reg[0], reg[1]);
return 0;
case FBIMSTT_GETCMAPREG:
if (copy_from_user(reg, argp, 4) || reg[0] > (0x1000 - sizeof(reg[0])) / sizeof(reg[0]))
return -EFAULT;
- reg[1] = read_reg_le32(((u_int *)par->cmap_regs), reg[0]);
+ reg[1] = read_reg_le32(((u_int __iomem *)par->cmap_regs), reg[0]);
if (copy_to_user((void __user *)(arg + 4), &reg[1], 4))
return -EFAULT;
return 0;
OpenPOWER on IntegriCloud