[PATCH 4.14 ] platform/x86: Corrects warning: missing braces around initializer
From: john . p . donnelly
Date: Fri Oct 30 2020 - 11:52:20 EST
From: John Donnelly <john.p.donnelly@xxxxxxxxxx>
The assignment statement of a local variable "struct tp_nvram_state s[2] = {0}; "
is not valid for all versions of compilers (UEK6 on OL7).
Fixes: 515ded02bc4b ("platform/x86: thinkpad_acpi: initialize tp_nvram_state variable")
Signed-off-by: John Donnelly <john.p.donnelly@xxxxxxxxxx>
---
drivers/platform/x86/thinkpad_acpi.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index ffaaccded34e..c41ac0385304 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2477,7 +2477,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
*/
static int hotkey_kthread(void *data)
{
- struct tp_nvram_state s[2] = { 0 };
+ struct tp_nvram_state s[2];
u32 poll_mask, event_mask;
unsigned int si, so;
unsigned long t;
@@ -2488,6 +2488,8 @@ static int hotkey_kthread(void *data)
if (tpacpi_lifecycle == TPACPI_LIFE_EXITING)
goto exit;
+ memset(&s, 0, sizeof(s));
+
set_freezable();
so = 0;
--
2.27.0