Commit 134d8b78 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] fix for breakage introduced in hgafb.c

ChangeSet "adaplas: [PATCH] fbdev: Add __iomem annotations to hgafb" had
actually broken it - it not only added a (useless) cast in rowaddr(), it
had also added a dereferencing.

Since it is video memory and since we do memory transfers on the
resulting "address"...  IOW, it's even exploitable - not that there had
been a lot of HGA boxen out there, but... 

This restores the intended behaviour.
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent be7092f3
......@@ -68,7 +68,7 @@ static unsigned long hga_vram_len; /* Size of video memory */
static inline u8 __iomem * rowaddr(struct fb_info *info, u_int row)
{
return (u8 __iomem *) (fb_readl(info->screen_base + HGA_ROWADDR(row)));
return info->screen_base + HGA_ROWADDR(row);
}
static int hga_mode = -1; /* 0 = txt, 1 = gfx mode */
......
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