Commit f815e818 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] imsttfb missing iomem annotations

write_reg_le32() and read_reg_le32() expect iomem pointers...
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 66768eb2
...@@ -1287,12 +1287,12 @@ imsttfb_ioctl(struct inode *inode, struct file *file, u_int cmd, ...@@ -1287,12 +1287,12 @@ imsttfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
case FBIMSTT_SETCMAPREG: case FBIMSTT_SETCMAPREG:
if (copy_from_user(reg, argp, 8) || reg[0] > (0x1000 - sizeof(reg[0])) / sizeof(reg[0])) if (copy_from_user(reg, argp, 8) || reg[0] > (0x1000 - sizeof(reg[0])) / sizeof(reg[0]))
return -EFAULT; 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; return 0;
case FBIMSTT_GETCMAPREG: case FBIMSTT_GETCMAPREG:
if (copy_from_user(reg, argp, 4) || reg[0] > (0x1000 - sizeof(reg[0])) / sizeof(reg[0])) if (copy_from_user(reg, argp, 4) || reg[0] > (0x1000 - sizeof(reg[0])) / sizeof(reg[0]))
return -EFAULT; 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)) if (copy_to_user((void __user *)(arg + 4), &reg[1], 4))
return -EFAULT; return -EFAULT;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment