Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752824AbbBESZh (ORCPT ); Thu, 5 Feb 2015 13:25:37 -0500 Received: from mail-wi0-f180.google.com ([209.85.212.180]:62919 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752630AbbBESZf (ORCPT ); Thu, 5 Feb 2015 13:25:35 -0500 From: Alban Browaeys X-Google-Original-From: Alban Browaeys To: Tomeu Vizoso , Mike Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, Alban Browaeys Subject: [PATCH 2/2] clk: Fix OOPS calling hlist_del on an already poisoned hlist. Date: Thu, 5 Feb 2015 19:24:50 +0100 Message-Id: <1423160690-7853-2-git-send-email-prahal@yahoo.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1423160690-7853-1-git-send-email-prahal@yahoo.com> References: <1423160690-7853-1-git-send-email-prahal@yahoo.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1323 Lines: 43 Put is called more than once, thus hlist_del ends up on a poisoned list. Move hlist_del to the __clk_release handler managed by kref instead of calling it in _clk_put. Fixes: 1c8e600440c7 ("clk: Add rate constraints to clocks") Signed-off-by: Alban Browaeys --- drivers/clk/clk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 8f33722..f1d4b33 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2489,6 +2489,9 @@ static void __clk_release(struct kref *ref) struct clk *clk = container_of(&core, struct clk, core); int i = core->num_parents; + hlist_del(&clk->child_node); + clk_core_set_rate_nolock(clk->core, clk->core->req_rate); + kfree(core->parents); while (--i >= 0) kfree_const(core->parent_names[i]); @@ -2666,8 +2669,6 @@ void __clk_put(struct clk *clk) clk_prepare_lock(); - hlist_del(&clk->child_node); - clk_core_set_rate_nolock(clk->core, clk->core->req_rate); owner = clk->core->owner; kref_put(&clk->core->ref, __clk_release); -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/