From patchwork Wed Jun 28 13:53:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9814345 X-Patchwork-Delegate: sboyd@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D5FF960383 for ; Wed, 28 Jun 2017 13:54:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27AC828066 for ; Wed, 28 Jun 2017 13:53:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C1402855E; Wed, 28 Jun 2017 13:53:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5671E28066 for ; Wed, 28 Jun 2017 13:53:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752208AbdF1Nxz (ORCPT ); Wed, 28 Jun 2017 09:53:55 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:33464 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751566AbdF1Nxx (ORCPT ); Wed, 28 Jun 2017 09:53:53 -0400 Received: by mail-wm0-f52.google.com with SMTP id z75so12543927wmc.0 for ; Wed, 28 Jun 2017 06:53:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=A7pRUmtGm4ZmEw3YrIZKufEsOu01VDVzsLRsRB37nrU=; b=NoEUxWsbIRLmD51FUUAvqlMmWu4cIlRjxHIhJ8ay6EKBjpxKBVKHcabqLVbO1UcG6Z iRLbcBLOTrDiRGItRSmIyPBMSNkeXgU66GtxKeUbEal00rRM2qycI6sjfIvaSKCl3mQv Hu+pjYcnILAR0JVW/Tva1qbZFxfmahYFOl0QOmwj3KP1ALqb8wJFkKWiMnMxxqkMdwWI GZ/h4nIEsi5cGkReH4DZ1B80ZOc2WqGksxPACD2CupJPrin5Xn+H21MbNXhl/JatHnAA uzbKfkynZsPCPrbXDNEWZ0mnF4wMa+sBR1hiEmC8Jn0H/q9DlhR0AqM71gCjr7LcEzEo oN+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=A7pRUmtGm4ZmEw3YrIZKufEsOu01VDVzsLRsRB37nrU=; b=Tk8TExsq4nfS4HSwcbjmkixy5mZmgyCko7JJ/4n45FtHuCqim9B0loe34Fhyvnwk9/ 9x2kTn7W8LPepO8f/UiWd6GSLTgU3uvRxq6Do0RxxFwep0QPDJvooFTrssZQtpTSmbxM Y1LgJ03uxeBo4KyYCXYxdUUwDjgf26vYNv22398jQMZUEQA41RaT/F1YYLytVpvVBuhM k6GjICWtt9iAI8M9PuIVE7vpLRFVomOysrQqrpADVXT/ucnYHpUWPBVlNgv4w2opCQ8K VtCLIBbrhBehD3YKVW8ZyHrdV0Og6hQ5v95x2Y+G+wpOe90YWGlD0yYGAJFI10LseiXY jrdA== X-Gm-Message-State: AKS2vOwKDXXN8ErksllbnIr3YhklAUw3Ukl8pwUSuSI2ucb3gHKf1ar0 rhntsYozwU7b8GDz X-Received: by 10.28.11.145 with SMTP id 139mr8081841wml.11.1498658031812; Wed, 28 Jun 2017 06:53:51 -0700 (PDT) Received: from localhost.localdomain (uluru.liltaz.com. [163.172.81.188]) by smtp.googlemail.com with ESMTPSA id e31sm3558408wre.54.2017.06.28.06.53.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 06:53:51 -0700 (PDT) From: Jerome Brunet To: Sudeep Holla , Michael Turquette , Stephen Boyd Cc: Jerome Brunet , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong , Kevin Hilman Subject: [PATCH] clk: scpi: error when clock fails to register Date: Wed, 28 Jun 2017 15:53:45 +0200 Message-Id: <20170628135345.9337-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.4 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Current implementation of scpi_clk_add just print a warning when clock fails to register but then keep going as if nothing happened. The provider is then registered with bogus data. This may latter lead to an Oops in __clk_create_clk when hlist_add_head(&clk->clks_node, &hw->core->clks) is called. This patch fixes the issue and errors if a clock fails to register. Fixes: cd52c2a4b5c4 ("clk: add support for clocks provided by SCP(System Control Processor)") Signed-off-by: Jerome Brunet Reviewed-by: Sudeep Holla --- drivers/clk/clk-scpi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk-scpi.c b/drivers/clk/clk-scpi.c index 96d37175d0ad..e44b5ca91fed 100644 --- a/drivers/clk/clk-scpi.c +++ b/drivers/clk/clk-scpi.c @@ -245,10 +245,12 @@ static int scpi_clk_add(struct device *dev, struct device_node *np, sclk->id = val; err = scpi_clk_ops_init(dev, match, sclk, name); - if (err) + if (err) { dev_err(dev, "failed to register clock '%s'\n", name); - else - dev_dbg(dev, "Registered clock '%s'\n", name); + return err; + } + + dev_dbg(dev, "Registered clock '%s'\n", name); clk_data->clk[idx] = sclk; }