Commit 1110ebe0 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'fbdev-for-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev

Pull fbdev fixes and cleanups from Helge Deller:
 "A crash fix in stifb which was missed to be included in the drm-misc
  tree, two checks to prevent wrong userspace input in sisfb and
  savagefb and two trivial printk cleanups:

   - stifb: Fix crash in stifb_blank()

   - savage/sis: Error out if pixclock equals zero

   - minor trivial cleanups"

* tag 'fbdev-for-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: stifb: Fix crash in stifb_blank()
  fbcon: Fix incorrect printed function name in fbcon_prepare_logo()
  fbdev: sis: Error out if pixclock equals zero
  fbdev: savage: Error out if pixclock equals zero
  fbdev: vt8500lcdfb: Remove unnecessary print function dev_err()
parents 615d3006 4b088005
...@@ -631,8 +631,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, ...@@ -631,8 +631,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
if (logo_lines > vc->vc_bottom) { if (logo_lines > vc->vc_bottom) {
logo_shown = FBCON_LOGO_CANSHOW; logo_shown = FBCON_LOGO_CANSHOW;
printk(KERN_INFO pr_info("fbcon: disable boot-logo (boot-logo bigger than screen).\n");
"fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
} else { } else {
logo_shown = FBCON_LOGO_DRAW; logo_shown = FBCON_LOGO_DRAW;
vc->vc_top = logo_lines; vc->vc_top = logo_lines;
......
...@@ -869,6 +869,9 @@ static int savagefb_check_var(struct fb_var_screeninfo *var, ...@@ -869,6 +869,9 @@ static int savagefb_check_var(struct fb_var_screeninfo *var,
DBG("savagefb_check_var"); DBG("savagefb_check_var");
if (!var->pixclock)
return -EINVAL;
var->transp.offset = 0; var->transp.offset = 0;
var->transp.length = 0; var->transp.length = 0;
switch (var->bits_per_pixel) { switch (var->bits_per_pixel) {
......
...@@ -1444,6 +1444,8 @@ sisfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) ...@@ -1444,6 +1444,8 @@ sisfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
vtotal = var->upper_margin + var->lower_margin + var->vsync_len; vtotal = var->upper_margin + var->lower_margin + var->vsync_len;
if (!var->pixclock)
return -EINVAL;
pixclock = var->pixclock; pixclock = var->pixclock;
if((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED) { if((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED) {
......
...@@ -1158,7 +1158,7 @@ stifb_init_display(struct stifb_info *fb) ...@@ -1158,7 +1158,7 @@ stifb_init_display(struct stifb_info *fb)
} }
break; break;
} }
stifb_blank(0, (struct fb_info *)fb); /* 0=enable screen */ stifb_blank(0, fb->info); /* 0=enable screen */
SETUP_FB(fb); SETUP_FB(fb);
} }
......
...@@ -374,7 +374,6 @@ static int vt8500lcd_probe(struct platform_device *pdev) ...@@ -374,7 +374,6 @@ static int vt8500lcd_probe(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) { if (irq < 0) {
dev_err(&pdev->dev, "no IRQ defined\n");
ret = -ENODEV; ret = -ENODEV;
goto failed_free_palette; goto failed_free_palette;
} }
......
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