From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032559AbbKENXv (ORCPT ); Thu, 5 Nov 2015 08:23:51 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33700 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755867AbbKENXu (ORCPT ); Thu, 5 Nov 2015 08:23:50 -0500 From: Peng Fan To: linux-kernel@vger.kernel.org Cc: van.freenix@gmail.com, Lee Jones , Arnd Bergmann Subject: [PATCH] mfd: syscon: check 'property' before of_node_put Date: Thu, 5 Nov 2015 21:23:35 +0800 Message-Id: <1446729815-25473-1-git-send-email-van.freenix@gmail.com> X-Mailer: git-send-email 1.8.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When 'property' is not NULL, of_parse_phandle will return the node pointer with refcount incremented. So when of_node_put, also need to check property. Signed-off-by: Peng Fan Cc: Lee Jones Cc: Arnd Bergmann --- drivers/mfd/syscon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index 176bf0f..fab36bc 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -168,7 +168,9 @@ struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np, return ERR_PTR(-ENODEV); regmap = syscon_node_to_regmap(syscon_np); - of_node_put(syscon_np); + + if (property) + of_node_put(syscon_np); return regmap; } -- 1.8.4