mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH master] usbgadget: autostart: don't print error on repeated nv.usbgadget.autostart=1
Date: Fri, 20 Nov 2020 15:07:28 +0100	[thread overview]
Message-ID: <20201120140728.31805-1-a.fatoum@pengutronix.de> (raw)

nvvar_add results in two calls to dev_set_param:
 - once when the existing global variable is found and set
 - once more when setting the nv variable

This results in an annoying but ultimately harmless message on startup:

  ERROR: USB multi gadget already registered
  ERROR: failed to create nv variable usbgadget.autostart: Device or
  resource busy

Avoid this by ignoring usbgadget.autostart=1 after it succeeded once.

This issue should only affect $global.usbgadget.autostart, because all
other global variables are "simple" meaning that they have no setters
triggered.

Fixes: 5a5c5178e7dc ("usbgadget: autostart: support delayed usbgadget.autostart=1")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 common/usbgadget.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/usbgadget.c b/common/usbgadget.c
index fb508db94762..8b351c7bf468 100644
--- a/common/usbgadget.c
+++ b/common/usbgadget.c
@@ -102,12 +102,18 @@ int usbgadget_register(bool dfu, const char *dfu_opts,
 
 static int usbgadget_autostart_set(struct param_d *param, void *ctx)
 {
+	static bool started;
 	bool fastboot_bbu = get_fastboot_bbu();
+	int err;
 
-	if (!IS_ENABLED(CONFIG_USB_GADGET_AUTOSTART) || !autostart)
+	if (!IS_ENABLED(CONFIG_USB_GADGET_AUTOSTART) || !autostart || started)
 		return 0;
 
-	return usbgadget_register(true, NULL, true, NULL, acm, fastboot_bbu);
+	err = usbgadget_register(true, NULL, true, NULL, acm, fastboot_bbu);
+	if (!err)
+		started = true;
+
+	return err;
 }
 
 static int usbgadget_globalvars_init(void)
-- 
2.29.2


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

             reply	other threads:[~2020-11-20 14:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-20 14:07 Ahmad Fatoum [this message]
2020-11-24  8:34 ` Sascha Hauer

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=20201120140728.31805-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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