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: 106536 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1043139qge; Wed, 28 Jun 2017 06:54:30 -0700 (PDT) X-Received: by 10.84.167.2 with SMTP id c2mr11873596plb.155.1498658070581; Wed, 28 Jun 2017 06:54:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498658070; cv=none; d=google.com; s=arc-20160816; b=oWhQXKMAhmASGVE061vNyiItgu+mYELHne0pi/Jnoi2A+wDP//PsguvOlHcanmz2tf qVSu1pj4Ndfe42LU6bDeEh/erXqpaRg0dL2du5b1cUXBUUpy2Tv6PVL+H9d48hBnfXyN hCLgjSrgDjvWfTbq7LllFVlMdsSZeKfXJvnCuthJzhQPjfsOXYdirwY1gLwuB+yWwevE f64/7K6ErKFXx06/SF3j/ODjYnjlYanrLMNRrGBn/LFUXFMoAEjbIDFlk6xtaFomyYpm vA9lIeO5jI7gHjiP3GnSaD+nvw/kNnkSiTN7b428TlhsPlZe8zaoUUZfLzz2454YYyC1 jozg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=A7pRUmtGm4ZmEw3YrIZKufEsOu01VDVzsLRsRB37nrU=; b=i2cUcB5BtQ5JmJqSYshqeeOmWsN6FO4tqeWD93fqfaVfO/g/+8QWf6jZgkeff39R61 DwmRXD6YICMkQwRmSQ91E+urq0y8FKKRO7c24B8JHa4o6tihOyRObitqjJ9tyGyRGD/u DDUMyeAaEyrK9SDx8DsrKr4OtQA21yNpPeKRVY4AeQSOhxrtmF1MbIMOSZgfjCpMWjSj K7VtT5IvxnykxqUfLtRpUp+zadmIEI5zOUfwATJPydgA8jxqk/7gURcPJaK8nApnp8nm OvfUizDTeC/lCMMtNXh9+GEJ0bveHI0Qf1IbohLl09zYrnLn/BOArLppa1PBtrn3SY0j hGEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.b=NoEUxWsb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b10si1740781pll.359.2017.06.28.06.54.30; Wed, 28 Jun 2017 06:54:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.b=NoEUxWsb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752288AbdF1NyH (ORCPT + 25 others); Wed, 28 Jun 2017 09:54:07 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:35597 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752015AbdF1Nx6 (ORCPT ); Wed, 28 Jun 2017 09:53:58 -0400 Received: by mail-wm0-f53.google.com with SMTP id w126so54135882wme.0 for ; Wed, 28 Jun 2017 06:53:52 -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=nB3IHRqc2A8RnbJIRUvKUZTqDY2JLZolESB3K3LN2Ck4pCnUNHtIuldpWdZWcPvCxw Dc48bUwS8cEMmLkPBvumn12brcTXP9HVci6Sar90d3He5PwKJDVt20mjUyPxTbcD1Ffb UvCaFvRvnfUBYECOU7aHu1kNthFL3VEoz0SoCcx4HTudNTuRbeKMJ7P0YjzgSKD0LqeW 6WgAuqlTOgzxl07f/DTYGxF8MXeuFVPwNJz7xdX0F9vi9KWBnkdlMWVYGRcsyIzGcAIs 7zbUrSkw6I4KwzBngvh+tFugZAhL7GH/Y+fMXixga9lHE6cZMJ42OtnJO2e+nJ79V4SL sw6Q== X-Gm-Message-State: AKS2vOzSnelD8IFOY32350rId7M71AVF5eNZLcm0PIehaNLgCbJLxG1t 4xKBYTEesCfp6GYW 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/clk/clk-scpi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.9.4 Reviewed-by: Sudeep Holla 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; }