Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61266f85 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

media: si470x: Avoid card name truncation 



[ Upstream commit 2908249f3878a591f7918368fdf0b7b0a6c3158c ]

The "card" string only holds 31 characters (and the terminating NUL).
In order to avoid truncation, use a shorter card description instead of
the current result, "Silicon Labs Si470x FM Radio Re".

Suggested-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Fixes: 78656acd ("V4L/DVB (7038): USB radio driver for Silicon Labs Si470x FM Radio Receivers")
Fixes: cc35bbdd ("V4L/DVB (12416): radio-si470x: add i2c driver for si470x")
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4e65b9ec

drivers/media/radio/si470x/radio-si470x-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


/* driver definitions */

#define DRIVER_AUTHOR "Joonyoung Shim <jy0922.shim@samsung.com>";

#define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver"

#define DRIVER_CARD "Silicon Labs Si470x FM Radio"

#define DRIVER_DESC "I2C radio driver for Si470x FM Radio Receivers"

#define DRIVER_VERSION "1.0.2"

drivers/media/radio/si470x/radio-si470x-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/* driver definitions */

#define DRIVER_AUTHOR "Tobias Lorenz <tobias.lorenz@gmx.net>"

#define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver"

#define DRIVER_CARD "Silicon Labs Si470x FM Radio"

#define DRIVER_DESC "USB radio driver for Si470x FM Radio Receivers"

#define DRIVER_VERSION "1.0.10"