[PATCH 1/1] Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle"

Tomi Valkeinen tomi.valkeinen at ti.com
Tue Sep 13 12:28:21 UTC 2016


Hi Dave,

Ping on this. This one is already in drm-next, so one can just
cherry-pick it: 5a78ff7bf7e25191144b550961001bbf6c734da4

 Tomi

On 06/09/16 15:18, Tomi Valkeinen wrote:
> Hi Dave,
> 
> Can you pick this for drm-fixes? The bug is causing scary looking stack
> dumps when loading omapdrm.
> 
> Apparently this fix went into drm-next accidentally instead of
> drm-fixes. I hope having the same patch in both trees won't be causing
> any extra conflicts.
> 
>  Tomi
> 
> On 11/08/16 12:44, Peter Chen wrote:
>> This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.
>>
>> The of_get_next_parent will drop refcount on the passed node, so the reverted
>> patch is wrong, thanks for Tomi Valkeinen points it.
>>
>> Cc: Tomi Valkeinen <tomi.valkeinen at ti.com>
>> Signed-off-by: Peter Chen <peter.chen at nxp.com>
>> ---
>>  drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
>> index e256d87..dfd4e96 100644
>> --- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
>> +++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
>> @@ -125,16 +125,15 @@ u32 dss_of_port_get_port_number(struct device_node *port)
>>  
>>  static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
>>  {
>> -	struct device_node *np, *np_parent;
>> +	struct device_node *np;
>>  
>>  	np = of_parse_phandle(node, "remote-endpoint", 0);
>>  	if (!np)
>>  		return NULL;
>>  
>> -	np_parent = of_get_next_parent(np);
>> -	of_node_put(np);
>> +	np = of_get_next_parent(np);
>>  
>> -	return np_parent;
>> +	return np;
>>  }
>>  
>>  struct device_node *
>>
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20160913/d30201eb/attachment.sig>


More information about the dri-devel mailing list