From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 27 Oct 2023 10:18:50 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qwI3O-005oUo-Ds for lore@lore.pengutronix.de; Fri, 27 Oct 2023 10:18:50 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qwI3N-0000rh-91 for lore@pengutronix.de; Fri, 27 Oct 2023 10:18:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ztmSDZuWw/RtLx3SioqdeQjuecdomc3xdYPzYs1cHOM=; b=JIu1B5jFZ6R3bzBLPo30+sH8Lq VbbpVCtxxSQ1ucvKlCGl7JjYF/MVZg6C4+VXsX4VIjqTPeaBFfQ+CBCO5KbhZ363X7q9OUIRwJTbi 30d2gPZYtlGxAZXRDDg2lzWzJH8wb7b8MKEL6exfOjrm4I13+2mE8SICLlamUi+1MltCCBbv9A6mh w0usZwCuUdKYgBaMsRS9Y/852qhQo5PXYTNsira1aR1UGzBZykhIZZcGmCVRNBwJ6Fsqppx8FwlSn EumulQaKH5GuSg17rsiElD0HjPMTyNAf20ME6/DDQtVrwZdUGrEyW8Oi7QU5pCxSQFRvhzJemSr9W pmVPC69A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qwI2I-00Fui0-2v; Fri, 27 Oct 2023 08:17:42 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qwI2G-00Fugm-1W for barebox@lists.infradead.org; Fri, 27 Oct 2023 08:17:42 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qwI2F-0000ge-19; Fri, 27 Oct 2023 10:17:39 +0200 Received: from [2a0a:edc0:2:b01:1d::c0] (helo=ptx.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qwI2E-004bCF-L7; Fri, 27 Oct 2023 10:17:38 +0200 Received: from sha by ptx.whiteo.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1qwI2E-00GaFa-IR; Fri, 27 Oct 2023 10:17:38 +0200 Date: Fri, 27 Oct 2023 10:17:38 +0200 From: Sascha Hauer To: Marco Felsch Cc: Ahmad Fatoum , barebox@lists.infradead.org Message-ID: <20231027081738.GA3359458@pengutronix.de> References: <20231026144325.4172966-1-m.felsch@pengutronix.de> <20231027080034.GZ3359458@pengutronix.de> <20231027080943.lpdzdpcgi6n6f7mk@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231027080943.lpdzdpcgi6n6f7mk@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231027_011740_506955_7376E4E8 X-CRM114-Status: GOOD ( 28.27 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH v2 1/2] usb: gadget: initialize serialnumber X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) On Fri, Oct 27, 2023 at 10:09:43AM +0200, Marco Felsch wrote: > On 23-10-27, Sascha Hauer wrote: > > On Thu, Oct 26, 2023 at 11:32:10PM +0200, Ahmad Fatoum wrote: > > > On 26.10.23 16:43, Marco Felsch wrote: > > > > Windows hosts do require the serial number to be set to any ascii string > > > > to enumerate correctly. Set the serial number if provided or to "unset" > > > > if not to provide a sane default which works for both hosts. > > > > > > > > Reported-by: Andrey Zhizhikin > > > > Signed-off-by: Marco Felsch > > > > > > Reviewed-by: Ahmad Fatoum > > > > > > > --- > > > > Changelog > > > > > > > > v2: > > > > - adapt commit message > > > > - use barebox_get_serial_number() and "unset" > > > > > > > > drivers/usb/gadget/udc/core.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c > > > > index b58498680ad1..e7cfa0d5d836 100644 > > > > --- a/drivers/usb/gadget/udc/core.c > > > > +++ b/drivers/usb/gadget/udc/core.c > > > > @@ -1204,7 +1204,7 @@ int usb_add_gadget(struct usb_gadget *gadget) > > > > gadget->productname = xstrdup(barebox_get_model()); > > > > dev_add_param_string(&gadget->dev, "productname", NULL, NULL, > > > > &gadget->productname, NULL); > > > > - gadget->serialnumber = xstrdup(""); > > > > + gadget->serialnumber = xstrdup(barebox_get_serial_number() ? : "unset"); > > > > > > Nitpick: xstrdup(NULL) == NULL, so the ternary could be moved out the xstrdup. > > > > gadget->serialnumber is freed when the value of the variable is changed, > > so it must be an allocated string. gadget->serialnumber = "unset" would > > be wrong. > > I would have done the following: > > xstrdup(barebox_get_serial_number()) ? : xstrdup("unset"); Your original code looked better. This one looks like the ?: handles failures in xstrdup(). Sascha > > > > > Sascha > > > > > > > > > dev_add_param_string(&gadget->dev, "serialnumber", NULL, NULL, > > > > &gadget->serialnumber, NULL); > > > > > > > > > > -- > > > Pengutronix e.K. | | > > > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > > > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > > > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > > > > > > > > > > > > -- > > Pengutronix e.K. | | > > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |