Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758213AbaFULa1 (ORCPT ); Sat, 21 Jun 2014 07:30:27 -0400 Received: from mail.kernel.org ([198.145.19.201]:44014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751486AbaFULaZ (ORCPT ); Sat, 21 Jun 2014 07:30:25 -0400 Message-ID: <53A56D48.5040500@kernel.org> Date: Sat, 21 Jun 2014 12:32:24 +0100 From: Jonathan Cameron User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Adam Thomson , Lee Jones , Samuel Ortiz , linux-iio@vger.kernel.org, Dmitry Eremin-Solenikov , David Woodhouse , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , devicetree@vger.kernel.org CC: linux-kernel@vger.kernel.org, support.opensource@diasemi.com Subject: Re: [PATCH 3/8] iio: of_iio_channel_get_by_name() returns non-null pointers for error legs References: <0e7c03b0467ae1eace9dafebe6946d01d48e72f2.1402484954.git.Adam.Thomson.Opensource@diasemi.com> <539E0001.60005@kernel.org> In-Reply-To: <539E0001.60005@kernel.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 15/06/14 21:20, Jonathan Cameron wrote: > On 11/06/14 12:11, Adam Thomson wrote: >> Currently in the inkern.c code for IIO framework, the function >> of_iio_channel_get_by_name() will return a non-NULL pointer when >> it cannot find a channel using of_iio_channel_get() and when it >> tries to search for 'io-channel-ranges' property and fails. This >> is incorrect behaviour as the function which calls this expects >> a NULL pointer for failure. This patch rectifies the issue. >> >> Signed-off-by: Adam Thomson > Hi Adam, > > Good find. I've only recently sent a pull request for fixes upstream, > so I'll pick this up in a day or so once that has gone. Applied to the fixes-togreg branch of iio.git and cc'd to stable. Thanks, Jonathan > > J >> --- >> drivers/iio/inkern.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c >> index 0cf5f8e..1e8e94d 100644 >> --- a/drivers/iio/inkern.c >> +++ b/drivers/iio/inkern.c >> @@ -183,7 +183,7 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np, >> else if (name && index >= 0) { >> pr_err("ERROR: could not get IIO channel %s:%s(%i)\n", >> np->full_name, name ? name : "", index); >> - return chan; >> + return NULL; >> } >> >> /* >> @@ -193,8 +193,9 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np, >> */ >> np = np->parent; >> if (np && !of_get_property(np, "io-channel-ranges", NULL)) >> - break; >> + return NULL; >> } >> + >> return chan; >> } >> >> @@ -317,6 +318,7 @@ struct iio_channel *iio_channel_get(struct device *dev, >> if (channel != NULL) >> return channel; >> } >> + >> return iio_channel_get_sys(name, channel_name); >> } >> EXPORT_SYMBOL_GPL(iio_channel_get); >> -- >> 1.9.3 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-iio" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/