Commit cf424ef0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev fixes and updates from Helge Deller:
 "A bunch of outstanding fbdev patches - all trivial and small"

* tag 'for-5.18/fbdev-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  video: fbdev: clps711x-fb: Use syscon_regmap_lookup_by_phandle
  video: fbdev: mmp: replace usage of found with dedicated list iterator variable
  video: fbdev: sh_mobile_lcdcfb: Remove sh_mobile_lcdc_check_var() declaration
  video: fbdev: i740fb: Error out if 'pixclock' equals zero
  video: fbdev: i740fb: use memset_io() to clear screen
  video: fbdev: s3fb: Error out if 'pixclock' equals zero
  video: fbdev: arkfb: Error out if 'pixclock' equals zero
  video: fbdev: tridentfb: Error out if 'pixclock' equals zero
  video: fbdev: vt8623fb: Error out if 'pixclock' equals zero
  video: fbdev: kyro: Error out if 'lineclock' equals zero
  video: fbdev: neofb: Fix the check of 'var->pixclock'
  video: fbdev: imxfb: Fix missing of_node_put in imxfb_probe
  video: fbdev: omap: Make it CCF clk API compatible
  video: fbdev: aty/matrox/...: Prepare cleanup of powerpc's asm/prom.h
  video: fbdev: pm2fb: Fix a kernel-doc formatting issue
  linux/fb.h: Spelling s/palette/palette/
  video: fbdev: sis: fix potential NULL dereference in sisfb_post_sis300()
  video: fbdev: pxafb: use if else instead
  video: fbdev: udlfb: properly check endpoint type
  video: fbdev: of: display_timing: Remove a redundant zeroing of memory
parents 4fad37d5 6fbe0cc5

drivers/video/fbdev/arkfb.c

+3 −0
Original line number Diff line number Diff line
@@ -566,6 +566,9 @@ static int arkfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) 
{

	int rv, mem, step;



	if (!var->pixclock)

		return -EINVAL;



	/* Find appropriate format */

	rv = svga_match_format (arkfb_formats, var, NULL);

	if (rv < 0)

drivers/video/fbdev/aty/aty128fb.c

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ 
#ifdef CONFIG_PPC_PMAC

#include <asm/machdep.h>

#include <asm/pmac_feature.h>

#include <asm/prom.h>

#include "../macmodes.h"

#endif

drivers/video/fbdev/aty/atyfb_base.c

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ 


#ifdef __powerpc__

#include <asm/machdep.h>

#include <asm/prom.h>

#include "../macmodes.h"

#endif

#ifdef __sparc__

drivers/video/fbdev/aty/radeon_pm.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#ifdef CONFIG_PPC_PMAC

#include <asm/machdep.h>

#include <asm/prom.h>

#include <asm/pmac_feature.h>

#endif

drivers/video/fbdev/aty/radeonfb.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include <asm/io.h>



#if defined(CONFIG_PPC) || defined(CONFIG_SPARC)

#ifdef CONFIG_SPARC

#include <asm/prom.h>

#endif