Skip to content

Commit 118499e

Browse files
Jiri Slabygregkh
authored andcommitted
newport_con: vc_color is now in state
Since commit 28bc24f (vc: separate state), vc->vc_color is known as vc->state.color. Somehow both me and 0-day bot missed this driver during the conversion. So fix the driver now. Reported-by: kernel test robot <[email protected]> Fixes: 28bc24f ("vc: separate state") Signed-off-by: Jiri Slaby <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent bd78ecd commit 118499e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/video/console/newport_con.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,12 +359,12 @@ static void newport_clear(struct vc_data *vc, int sy, int sx, int height,
359359

360360
if (ystart < yend) {
361361
newport_clear_screen(sx << 3, ystart, xend, yend,
362-
(vc->vc_color & 0xf0) >> 4);
362+
(vc->state.color & 0xf0) >> 4);
363363
} else {
364364
newport_clear_screen(sx << 3, ystart, xend, 1023,
365-
(vc->vc_color & 0xf0) >> 4);
365+
(vc->state.color & 0xf0) >> 4);
366366
newport_clear_screen(sx << 3, 0, xend, yend,
367-
(vc->vc_color & 0xf0) >> 4);
367+
(vc->state.color & 0xf0) >> 4);
368368
}
369369
}
370370

@@ -588,11 +588,11 @@ static bool newport_scroll(struct vc_data *vc, unsigned int t, unsigned int b,
588588
topscan = (topscan + (lines << 4)) & 0x3ff;
589589
newport_clear_lines(vc->vc_rows - lines,
590590
vc->vc_rows - 1,
591-
(vc->vc_color & 0xf0) >> 4);
591+
(vc->state.color & 0xf0) >> 4);
592592
} else {
593593
topscan = (topscan + (-lines << 4)) & 0x3ff;
594594
newport_clear_lines(0, lines - 1,
595-
(vc->vc_color & 0xf0) >> 4);
595+
(vc->state.color & 0xf0) >> 4);
596596
}
597597
npregs->cset.topscan = (topscan - 1) & 0x3ff;
598598
return false;

0 commit comments

Comments
 (0)