diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-07 09:53:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-07 09:53:58 -0700 |
| commit | b5a8466d37d30cfcc8015789f4a3f0c44b6c7bc6 (patch) | |
| tree | 26680b8ecd520af38149d67736372316052a540b /drivers/video/fbdev/q40fb.c | |
| parent | 1612c382ffbdf1f673caec76502b1c00e6d35363 (diff) | |
| parent | 6ba592fa014f21f35a8ee8da4ca7b95a018f13e8 (diff) | |
| download | lwn-b5a8466d37d30cfcc8015789f4a3f0c44b6c7bc6.tar.gz lwn-b5a8466d37d30cfcc8015789f4a3f0c44b6c7bc6.zip | |
Merge tag 'for-5.20/fbdev-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev updates from Helge Deller:
"The two major changes in this patchset corrects VGA modes, color
handling and various other smaller fixes in the Atari framebuffer (by
Geert Uytterhoeven), and devm_* conversion, platform data fixes and
header cleanups in the imxfb driver (by Uwe Kleine-König).
Other small patches clean up code in sa1100fb, cirrusfb and omapfb,
fix a refcount leak in amba-clcd (by Liang He), and adds parameter
checks to arkfb, i740fb, vt8623fb and s3fb (by Zheyu Ma)"
* tag 'for-5.20/fbdev-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (27 commits)
video: fbdev: s3fb: Check the size of screen before memset_io()
video: fbdev: arkfb: Check the size of screen before memset_io()
video: fbdev: vt8623fb: Check the size of screen before memset_io()
video: fbdev: i740fb: Check the argument of i740_calc_vclk()
video: fbdev: arkfb: Fix a divide-by-zero bug in ark_set_pixclock()
video: fbdev: imxfb: fix return value check in imxfb_probe()
video: fbdev: sis: fix typos in SiS_GetModeID()
video: fbdev: imxfb: Convert request_mem_region + ioremap to devm_ioremap_resource
video: fbdev: imxfb: Fold <linux/platform_data/video-imxfb.h> into only user
video: fbdev: imxfb: Drop unused symbols from header
video: fbdev: imxfb: Drop platform data support
video: fbdev: amba-clcd: Fix refcount leak bugs
video: fbdev: omapfb: Unexport omap*_update_window_async()
video: fbdev: atari: Remove backward bug-compatibility
video: fbdev: atari: Remove unused definitions and variables
video: fbdev: atari: Fix VGA modes
video: fbdev: atari: Fix TT High video mode vertical refresh
video: fbdev: atari: Remove unneeded casts to void *
video: fbdev: atari: Remove unneeded casts from void *
video: fbdev: atari: Fix ext_setcolreg()
...
Diffstat (limited to 'drivers/video/fbdev/q40fb.c')
| -rw-r--r-- | drivers/video/fbdev/q40fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/q40fb.c b/drivers/video/fbdev/q40fb.c index 079a2a7fb2c5..964bc88bb89c 100644 --- a/drivers/video/fbdev/q40fb.c +++ b/drivers/video/fbdev/q40fb.c @@ -133,7 +133,7 @@ static struct platform_device q40fb_device = { .name = "q40fb", }; -int __init q40fb_init(void) +static int __init q40fb_init(void) { int ret = 0; |