From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBdoa-0008NS-7x for barebox@lists.infradead.org; Mon, 28 Jul 2014 05:49:41 +0000 Date: Mon, 28 Jul 2014 07:49:17 +0200 From: Sascha Hauer Message-ID: <20140728054917.GU23235@pengutronix.de> References: <1406450152-23298-1-git-send-email-antonynpavlov@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1406450152-23298-1-git-send-email-antonynpavlov@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] led: try to get LED's label from the 'label' property To: Antony Pavlov Cc: barebox@lists.infradead.org On Sun, Jul 27, 2014 at 12:35:52PM +0400, Antony Pavlov wrote: > Signed-off-by: Antony Pavlov > --- > drivers/led/led-gpio.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/led/led-gpio.c b/drivers/led/led-gpio.c > index 7bb3b49..cddac08 100644 > --- a/drivers/led/led-gpio.c > +++ b/drivers/led/led-gpio.c > @@ -212,7 +212,9 @@ static int led_gpio_of_probe(struct device_d *dev) > continue; > > gled = xzalloc(sizeof(*gled)); > - gled->led.name = xstrdup(child->name); > + gled->led.name = xstrdup(of_get_property(child, "label", NULL)); When the property doesn't exist you pass NULL to xstrdup. This will crash. You'll have to add a check or make xstrdup tolerate NULL pointers. Sascha > + if (!gled->led.name) > + gled->led.name = xstrdup(child->name); > gled->gpio = gpio; > gled->active_low = (flags & OF_GPIO_ACTIVE_LOW) ? 1 : 0; > > -- > 2.0.1 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox