linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: john.p.donnelly@oracle.com
To: linux-kernel@vger.kernel.org
Cc: trix@redhat.com, andriy.shevchenko@linux.intel.com
Subject: [PATCH 4.14 ] platform/x86: Corrects warning: missing braces around initializer
Date: Fri, 30 Oct 2020 08:52:11 -0700	[thread overview]
Message-ID: <20201030155211.7218-1-john.p.donnelly@oracle.com> (raw)

From: John Donnelly <john.p.donnelly@oracle.com>

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@oracle.com>
---
 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


             reply	other threads:[~2020-10-30 15:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-30 15:52 john.p.donnelly [this message]
2020-10-30 15:56 ` [PATCH 4.14 ] platform/x86: Corrects warning: missing braces around initializer John Donnelly

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201030155211.7218-1-john.p.donnelly@oracle.com \
    --to=john.p.donnelly@oracle.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=trix@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).