Re: [PATCH v2 2/3] device property: the secondary fwnode needs to depend on the primary

[Andy Shevchenko]

On Tue, 2015-12-29 at 10:40 +0200, Heikki Krogerus wrote:
> Hi Andy,
> 
> Found a bug from my code..
> 
> > diff --git a/drivers/base/property.c b/drivers/base/property.c
> > index 0b22c8a..6c04d18 100644
> > --- a/drivers/base/property.c
> > +++ b/drivers/base/property.c
> > @@ -218,7 +218,7 @@ bool fwnode_property_present(struct
> > fwnode_handle *fwnode, const char *propname)
> > Â	bool ret;
> > Â
> > Â	ret = __fwnode_property_present(fwnode, propname);
> > -	if (ret == false && fwnode->secondary)
> > +	if (ret == false && fwnode && fwnode->secondary)
> > Â		ret = __fwnode_property_present(fwnode->secondary, 
> > propname);
> > Â	return ret;
> > Â}
> > @@ -423,7 +423,7 @@
> > EXPORT_SYMBOL_GPL(device_property_match_string);
> > Â	int _ret_;							
> > 		\
> > Â	_ret_ = FWNODE_PROP_READ(_fwnode_, _propname_, _type_,
> > _proptype_,		\
> > Â				Â_val_, _nval_);			
> > 		\
> > -	if (_ret_ == -EINVAL && _fwnode_->secondary)		
> > 			\
> > +	if (_ret_ == -EINVAL && fwnode && _fwnode_->secondary)	
> > 			\
> 
> This should be .._fwnode_ && _fwnode_->secondary)

Yeah, we compiled it correctly due to fwnode presents in all
occurrences of this macro.

I will fix and resend a new version.

> 
> > Â		_ret_ = FWNODE_PROP_READ(_fwnode_->secondary,
> > _propname_, _type_,	\
> > Â				_proptype_, _val_, _nval_);	
> > 			\
> > Â	_ret_;							
> > 			\
> 
> 
> Cheers,
> 

-- 
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Intel Finland Oy

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/