diff options
author | Al Viro <viro@www.linux.org.uk> | 2005-04-26 10:43:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 10:43:42 -0400 |
commit | f815e8182b94f8fb5913b66454b40b484a2f70cc (patch) | |
tree | 214d245b16a664f9f638cb1931df33110070e775 /drivers | |
parent | 66768eb26c471091dc4ea1ed59b4bab7edc3d7bd (diff) |
[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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/imsttfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c index 5a72ca3c0138..7b9bf45ab6fe 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, | |||
1287 | case FBIMSTT_SETCMAPREG: | 1287 | case FBIMSTT_SETCMAPREG: |
1288 | if (copy_from_user(reg, argp, 8) || reg[0] > (0x1000 - sizeof(reg[0])) / sizeof(reg[0])) | 1288 | if (copy_from_user(reg, argp, 8) || reg[0] > (0x1000 - sizeof(reg[0])) / sizeof(reg[0])) |
1289 | return -EFAULT; | 1289 | return -EFAULT; |
1290 | write_reg_le32(((u_int *)par->cmap_regs), reg[0], reg[1]); | 1290 | write_reg_le32(((u_int __iomem *)par->cmap_regs), reg[0], reg[1]); |
1291 | return 0; | 1291 | return 0; |
1292 | case FBIMSTT_GETCMAPREG: | 1292 | case FBIMSTT_GETCMAPREG: |
1293 | if (copy_from_user(reg, argp, 4) || reg[0] > (0x1000 - sizeof(reg[0])) / sizeof(reg[0])) | 1293 | if (copy_from_user(reg, argp, 4) || reg[0] > (0x1000 - sizeof(reg[0])) / sizeof(reg[0])) |
1294 | return -EFAULT; | 1294 | return -EFAULT; |
1295 | reg[1] = read_reg_le32(((u_int *)par->cmap_regs), reg[0]); | 1295 | reg[1] = read_reg_le32(((u_int __iomem *)par->cmap_regs), reg[0]); |
1296 | if (copy_to_user((void __user *)(arg + 4), ®[1], 4)) | 1296 | if (copy_to_user((void __user *)(arg + 4), ®[1], 4)) |
1297 | return -EFAULT; | 1297 | return -EFAULT; |
1298 | return 0; | 1298 | return 0; |