mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-12 03:26:26 +00:00
Fonts: Make font size unsigned in font_desc
commit 7cb4150034
upstream.
`width` and `height` are defined as unsigned in our UAPI font descriptor
`struct console_font`. Make them unsigned in our kernel font descriptor
`struct font_desc`, too.
Also, change the corresponding printk() format identifiers from `%d` to
`%u`, in sti_select_fbfont().
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028105647.1210161-1-yepeilin.cs@gmail.com
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c5b9b7fb12
commit
78e008dca2
2 changed files with 2 additions and 2 deletions
|
@ -503,7 +503,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
|
||||||
if (!fbfont)
|
if (!fbfont)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
pr_info("STI selected %dx%d framebuffer font %s for sticon\n",
|
pr_info("STI selected %ux%u framebuffer font %s for sticon\n",
|
||||||
fbfont->width, fbfont->height, fbfont->name);
|
fbfont->width, fbfont->height, fbfont->name);
|
||||||
|
|
||||||
bpc = ((fbfont->width+7)/8) * fbfont->height;
|
bpc = ((fbfont->width+7)/8) * fbfont->height;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
struct font_desc {
|
struct font_desc {
|
||||||
int idx;
|
int idx;
|
||||||
const char *name;
|
const char *name;
|
||||||
int width, height;
|
unsigned int width, height;
|
||||||
const void *data;
|
const void *data;
|
||||||
int pref;
|
int pref;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue