Commit b691da35 authored by Stefan Bauer's avatar Stefan Bauer Committed by Linus Torvalds

i810fb: fix console switch regression

Since 4c7ffe0b ("fbdev: prevent drivers that
have hardware cursors from calling software cursor code") every call of
i810fb_cursor fails with -ENXIO because of a incorrect "!".

This hasn't struck until eaa0ff15 ("fix !
versus & precedence in various places") surrounded the expression with braces,
so that the intended behavior was inverted.  That caused 'pixel waste' - the
same line of multi-colored pixels repeated over the whole screen - during
console switch.

This switches back to the original pre-4c7ffe0b behavior.
Signed-off-by: default avatarStefan Bauer <stefan.bauer@cs.tu-chemnitz.de>
Tested-by: default avatarStefan Bauer <stefan.bauer@cs.tu-chemnitz.de>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Antonino Daplas <adaplas@pol.net>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d0025676
...@@ -1476,7 +1476,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor) ...@@ -1476,7 +1476,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
struct i810fb_par *par = info->par; struct i810fb_par *par = info->par;
u8 __iomem *mmio = par->mmio_start_virtual; u8 __iomem *mmio = par->mmio_start_virtual;
if (!(par->dev_flags & LOCKUP)) if (par->dev_flags & LOCKUP)
return -ENXIO; return -ENXIO;
if (cursor->image.width > 64 || cursor->image.height > 64) if (cursor->image.width > 64 || cursor->image.height > 64)
......
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