UPSTREAM: console: SisUSB2VGA: Drop dummy con_font_get()
authorKees Cook <keescook@chromium.org>
Tue, 27 Feb 2018 00:04:18 +0000 (16:04 -0800)
committerSami Tolvanen <samitolvanen@google.com>
Wed, 25 Apr 2018 23:04:03 +0000 (16:04 -0700)
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 <thomas@winischhofer.net>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I71d98ce1245f204c324c730a524c6e9a3ec26ef9
(cherry picked from commit ea92110bc048848967bd2a046675a006005c4f06)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
drivers/usb/misc/sisusbvga/sisusb_con.c

index f019d80ca9e40451a8a3bbca0671b95935a7798f..78112f97d8c7ce95700ee194f2e10f00966ff7d6 100644 (file)
@@ -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,
 };