diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-05 07:53:56 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-05 07:53:56 +0200 |
commit | 50e177c5bfd9abc3828cb57e14e6169170f6764a (patch) | |
tree | 180aafa376fb7a0a89c7d6812f640f8c46758bd5 /drivers/video/fbdev/ffb.c | |
parent | misc: microchip: pci1xxxx: Add power management functions - suspend & resume handlers. (diff) | |
parent | Linux 6.0-rc4 (diff) | |
download | linux-dev-50e177c5bfd9abc3828cb57e14e6169170f6764a.tar.xz linux-dev-50e177c5bfd9abc3828cb57e14e6169170f6764a.zip |
Merge 6.0-rc4 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/fbdev/ffb.c')
-rw-r--r-- | drivers/video/fbdev/ffb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/ffb.c b/drivers/video/fbdev/ffb.c index b3d580e57221..7cba3969a970 100644 --- a/drivers/video/fbdev/ffb.c +++ b/drivers/video/fbdev/ffb.c @@ -883,7 +883,7 @@ static void ffb_init_fix(struct fb_info *info) } else ffb_type_name = "Elite 3D"; - strlcpy(info->fix.id, ffb_type_name, sizeof(info->fix.id)); + strscpy(info->fix.id, ffb_type_name, sizeof(info->fix.id)); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = FB_VISUAL_TRUECOLOR; |