Skip to content

Commit

Permalink
fbcon: fix sparse warning about shadowing 'p' symbol
Browse files Browse the repository at this point in the history 
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Marcin Slusarz authored and Linus Torvalds committed Feb 6, 2008
1 parent cbfb3e0 commit 2c6cc35
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/video/console/fbcon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2795,7 +2795,7 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
{
struct fb_info *info = registered_fb[con2fb_map[fg_console]];
struct fbcon_ops *ops = info->fbcon_par;
struct display *p = &fb_display[fg_console];
struct display *disp = &fb_display[fg_console];
int offset, limit, scrollback_old;

if (softback_top) {
Expand Down Expand Up @@ -2833,7 +2833,7 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
logo_shown = FBCON_LOGO_CANSHOW;
}
fbcon_cursor(vc, CM_ERASE | CM_SOFTBACK);
fbcon_redraw_softback(vc, p, lines);
fbcon_redraw_softback(vc, disp, lines);
fbcon_cursor(vc, CM_DRAW | CM_SOFTBACK);
return 0;
}
Expand All @@ -2855,9 +2855,9 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)

fbcon_cursor(vc, CM_ERASE);

offset = p->yscroll - scrollback_current;
limit = p->vrows;
switch (p->scrollmode) {
offset = disp->yscroll - scrollback_current;
limit = disp->vrows;
switch (disp->scrollmode) {
case SCROLL_WRAP_MOVE:
info->var.vmode |= FB_VMODE_YWRAP;
break;
Expand Down

0 comments on commit 2c6cc35

Please sign in to comment.