Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754294AbdGUOxN (ORCPT ); Fri, 21 Jul 2017 10:53:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48324 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753917AbdGUOvm (ORCPT ); Fri, 21 Jul 2017 10:51:42 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 01CDF5473D Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lvivier@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 01CDF5473D From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: David Gibson , Michael Ellerman , linuxppc-dev@lists.ozlabs.org, Tyrel Datwyler , Thomas Huth Subject: [PATCH] powerpc/pseries: Fix of_node_put() underflow during pseries remove Date: Fri, 21 Jul 2017 16:51:39 +0200 Message-Id: <20170721145139.9384-1-lvivier@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 21 Jul 2017 14:51:42 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 885 Lines: 27 As for commit 68baf692c435 ("powerpc/pseries: Fix of_node_put() underflow during DLPAR remove"), the call to of_node_put() must be removed from pSeries_reconfig_remove_node(). dlpar_detach_node() and pSeries_reconfig_remove_node() call of_detach_node(), and thus the node should not be released in this case too. Signed-off-by: Laurent Vivier --- arch/powerpc/platforms/pseries/reconfig.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c index e5bf1e8..011ef21 100644 --- a/arch/powerpc/platforms/pseries/reconfig.c +++ b/arch/powerpc/platforms/pseries/reconfig.c @@ -82,7 +82,6 @@ static int pSeries_reconfig_remove_node(struct device_node *np) of_detach_node(np); of_node_put(parent); - of_node_put(np); /* Must decrement the refcount */ return 0; } -- 2.9.4