From 25ed8eed265a07f08c1a81653cfe4c4b0ef5f9c4 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Mon, 26 Feb 2018 16:04:18 -0800 Subject: [PATCH] UPSTREAM: console: SisUSB2VGA: Drop dummy con_font_get() As done in commit: 724ba8b30b04 ("console/dummy: leave .con_font_get set to NULL") This drops the dummy .con_font_get(), as it could leave arguments uninitialized. Cc: Thomas Winischhofer Signed-off-by: Kees Cook Signed-off-by: Greg Kroah-Hartman Change-Id: I71d98ce1245f204c324c730a524c6e9a3ec26ef9 (cherry picked from commit ea92110bc048848967bd2a046675a006005c4f06) Signed-off-by: Sami Tolvanen --- drivers/usb/misc/sisusbvga/sisusb_con.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c index f019d80ca9e4..78112f97d8c7 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_con.c +++ b/drivers/usb/misc/sisusbvga/sisusb_con.c @@ -1357,7 +1357,6 @@ static const struct consw sisusb_dummy_con = { .con_switch = SISUSBCONDUMMY, .con_blank = SISUSBCONDUMMY, .con_font_set = SISUSBCONDUMMY, - .con_font_get = SISUSBCONDUMMY, .con_font_default = SISUSBCONDUMMY, .con_font_copy = SISUSBCONDUMMY, }; -- 2.20.1