mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Christian Eggers <ceggers@arri.de>
To: barebox@lists.infradead.org
Cc: Christian Eggers <ceggers@arri.de>, ceggers@gmx.de
Subject: [PATCH] Partly revert "globalvar: fix crash if CONFIG_NVVAR is not set"
Date: Tue, 21 Jan 2020 14:56:35 +0100	[thread overview]
Message-ID: <20200121135635.10170-1-ceggers@arri.de> (raw)

This partly reverts commit 804770590556be5c922c9fb7e779e72805911e57.

Checking for CONFIG_NVVAR is not required in nvvar_device_dispatch() as
nv_device is not used in this function (only the address is compared).

After fixing this, globalvar_simple_set() works again if CONFIG_NVVAR is
disabled.

Fixes: 8047705905 ("globalvar: fix crash if CONFIG_NVVAR is not set")
Signed-off-by: Christian Eggers <ceggers@arri.de>
---
 common/globalvar.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/common/globalvar.c b/common/globalvar.c
index 1bea7425d..cec0a9cc4 100644
--- a/common/globalvar.c
+++ b/common/globalvar.c
@@ -141,9 +141,6 @@ static int nvvar_device_dispatch(const char *name, struct device_d **dev,
 	const char *dot;
 	int dotpos;
 
-	if (!IS_ENABLED(CONFIG_NVVAR))
-		return -ENOSYS;
-
 	*dev = NULL;
 
 	if (strncmp(name, "dev.", 4))
-- 
Christian Eggers
Embedded software developer

Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

                 reply	other threads:[~2020-01-21 13:56 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20200121135635.10170-1-ceggers@arri.de \
    --to=ceggers@arri.de \
    --cc=barebox@lists.infradead.org \
    --cc=ceggers@gmx.de \
    /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