From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26518C2D0CE for ; Sun, 29 Dec 2019 18:16:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E909E206A4 for ; Sun, 29 Dec 2019 18:16:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577643418; bh=DQ1t5NSkAs3iDrmgUYCvkHzmGg7so4JXkx8GcNJykn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PssoHYJvz67jdqjSVRXFe6iBbqQ3gw6Q7+8i+1Y96brM30LqyZgBf/yE8CYp8Jys0 U2KuboeiXzIV3udpoUymopbYfCD+QjCYcnpInSLCOKH8IiEETkPnZlnSrONbDsTR1O g/LUt0iT5DXfGJPR/YeNiGYDnD+9is5K+FDJH204= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727566AbfL2RXm (ORCPT ); Sun, 29 Dec 2019 12:23:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:41594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727580AbfL2RXm (ORCPT ); Sun, 29 Dec 2019 12:23:42 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 124B7207FD; Sun, 29 Dec 2019 17:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640221; bh=DQ1t5NSkAs3iDrmgUYCvkHzmGg7so4JXkx8GcNJykn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g9uniTeQSP6EwqLVkFPmOVU0NA7jb5RMrviYL3rKqpK4JRkYcfbd4Z4hhn4p42B6j Z3zIcDq6rUipPL/xdeFEayg5t8cGgFR1h6BTZ1JZqmcXxH2QoeiuONuJQIEXNK3cAn Y9aUCRVaDBabzQ5tPav7xInpUH4OA7lnt/jSZ9DQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aaro Koskinen , Adam Ford , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Sebastian Reichel , Tero Kristo , Tony Lindgren , Herbert Xu , Sasha Levin Subject: [PATCH 4.14 041/161] hwrng: omap3-rom - Call clk_disable_unprepare() on exit only if not idled Date: Sun, 29 Dec 2019 18:18:09 +0100 Message-Id: <20191229162412.031459834@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162355.500086350@linuxfoundation.org> References: <20191229162355.500086350@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tony Lindgren [ Upstream commit eaecce12f5f0d2c35d278e41e1bc4522393861ab ] When unloading omap3-rom-rng, we'll get the following: WARNING: CPU: 0 PID: 100 at drivers/clk/clk.c:948 clk_core_disable This is because the clock may be already disabled by omap3_rom_rng_idle(). Let's fix the issue by checking for rng_idle on exit. Cc: Aaro Koskinen Cc: Adam Ford Cc: Pali Rohár Cc: Sebastian Reichel Cc: Tero Kristo Fixes: 1c6b7c2108bd ("hwrng: OMAP3 ROM Random Number Generator support") Signed-off-by: Tony Lindgren Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/char/hw_random/omap3-rom-rng.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/char/hw_random/omap3-rom-rng.c b/drivers/char/hw_random/omap3-rom-rng.c index 38b719017186..648e39ce6bd9 100644 --- a/drivers/char/hw_random/omap3-rom-rng.c +++ b/drivers/char/hw_random/omap3-rom-rng.c @@ -121,7 +121,8 @@ static int omap3_rom_rng_remove(struct platform_device *pdev) { cancel_delayed_work_sync(&idle_work); hwrng_unregister(&omap3_rom_rng_ops); - clk_disable_unprepare(rng_clk); + if (!rng_idle) + clk_disable_unprepare(rng_clk); return 0; } -- 2.20.1