Skip to content

Commit 9de2198

Browse files
keesdagomez137
authored andcommitted
media: dvb-usb-v2: lmedm04: Fix firmware macro definitions
The firmware filename macros incorrectly included semicolons in their string literal definitions. Right now, this wasn't causing any real problem, but coming changes to the MODULE_INFO() macro make this more sensitive. Specifically, when used with MODULE_FIRMWARE(), this created syntax errors during macro expansion: MODULE_FIRMWARE(LME2510_C_S7395); expands to: MODULE_INFO(firmware, "dvb-usb-lme2510c-s7395.fw";) ^ syntax error Remove the trailing semicolons from all six firmware filename macro definitions. Semicolons should only appear at the point of use, not in the macro definition. Reviewed-by: Hans Verkuil <hverkuil+cisco@kernel.org> Signed-off-by: Kees Cook <kees@kernel.org> Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Reviewed-by: Daniel Gomez <da.gomez@samsung.com> Tested-by: Daniel Gomez <da.gomez@samsung.com> Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
1 parent ee3b813 commit 9de2198

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/media/usb/dvb-usb-v2/lmedm04.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@
7070
#include "ts2020.h"
7171

7272

73-
#define LME2510_C_S7395 "dvb-usb-lme2510c-s7395.fw";
74-
#define LME2510_C_LG "dvb-usb-lme2510c-lg.fw";
75-
#define LME2510_C_S0194 "dvb-usb-lme2510c-s0194.fw";
76-
#define LME2510_C_RS2000 "dvb-usb-lme2510c-rs2000.fw";
77-
#define LME2510_LG "dvb-usb-lme2510-lg.fw";
78-
#define LME2510_S0194 "dvb-usb-lme2510-s0194.fw";
73+
#define LME2510_C_S7395 "dvb-usb-lme2510c-s7395.fw"
74+
#define LME2510_C_LG "dvb-usb-lme2510c-lg.fw"
75+
#define LME2510_C_S0194 "dvb-usb-lme2510c-s0194.fw"
76+
#define LME2510_C_RS2000 "dvb-usb-lme2510c-rs2000.fw"
77+
#define LME2510_LG "dvb-usb-lme2510-lg.fw"
78+
#define LME2510_S0194 "dvb-usb-lme2510-s0194.fw"
7979

8080
/* debug */
8181
static int dvb_usb_lme2510_debug;

0 commit comments

Comments
 (0)