diff options
author | Jiri Slaby <jslaby@suse.cz> | 2020-08-18 10:56:49 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-18 13:51:18 +0200 |
commit | e18d918bd2ccd725ac574f7d126ed0856fe794e3 (patch) | |
tree | ee9afc0bb568df50c6104462206b5b5647b7fff2 /drivers/video | |
parent | a579767c1f4e3270818504843a86ba3277127152 (diff) | |
download | linux-stable-e18d918bd2ccd725ac574f7d126ed0856fe794e3.tar.gz linux-stable-e18d918bd2ccd725ac574f7d126ed0856fe794e3.tar.bz2 linux-stable-e18d918bd2ccd725ac574f7d126ed0856fe794e3.zip |
newport_con: fix no return statement in newport_show_logo
When CONFIG_LOGO_SGI_CLUT224 is unset, newport_show_logo contains no
return, despite it should return a pointer. Add one returning NULL to
fix a compiler warning:
drivers/video/console/newport_con.c: In function 'newport_show_logo':
drivers/video/console/newport_con.c:132:1: warning: no return statement in function returning non-void
Note that the caller expects NULL from the function already.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Cc: linux-mips@vger.kernel.org
Link: https://lore.kernel.org/r/20200818085655.12071-2-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/console/newport_con.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c index 72f146d047d9..4d9110393479 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c @@ -131,6 +131,8 @@ static const struct linux_logo *newport_show_logo(void) npregs->go.hostrw0 = *data++ << 24; return logo; +#else + return NULL; #endif /* CONFIG_LOGO_SGI_CLUT224 */ } |