Commit b332ad9d authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Fix botched fbdev lvalue conversion

parent 1540760c
......@@ -492,17 +492,17 @@ static inline void reverse_order(u32 *l)
* CALLED FROM:
* rivafb_cursor()
*/
static void rivafb_load_cursor_image(struct riva_par *par, u8 *data,
u8 *mask, u16 bg, u16 fg, u32 w, u32 h)
static void rivafb_load_cursor_image(struct riva_par *par, u8 *data8,
u8 *mask8, u16 bg, u16 fg, u32 w, u32 h)
{
int i, j, k = 0;
u32 b, m, tmp;
u32 *data = (u32 *)data8;
u32 *mask = (u32 *)mask8;
for (i = 0; i < h; i++) {
b = *((u32 *)data);
b = (u32)((u32 *)b + 1);
m = *((u32 *)mask);
m = (u32)((u32 *)m + 1);
b = *data++;
m = *mask++;
reverse_order(&b);
for (j = 0; j < w/2; j++) {
......
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