Re: [PATCH 3/8] iio: of_iio_channel_get_by_name() returns non-null pointers for error legs

Jonathan Cameron
2014-06-21T11:30:27Z

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 <Adam.Thomson.Opensource@diasemi.com>
> 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