From patchwork Thu Feb 11 09:57:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 12082657 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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 A1116C433E0 for ; Thu, 11 Feb 2021 09:58:12 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D51B64E87 for ; Thu, 11 Feb 2021 09:58:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D51B64E87 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=98kKwSEXDKSQrBCKPix8P3UI6sUxmVcavAJxzWEb/kQ=; b=sScDBUqBvrKrKy2mM0wrG88VIi cBj+s+tIl2XEOgU6hPc8CzM3CivpyuZ1YbrlgMlbQ9esBMQ8tvhOtb/O6EojQ/aBvvkFLgSAsMLKX FTNP5GCS7Rhdni5wsyeuKZKoXYvOz8MKP2eidMkigfxofI8ZEAs0iyoJFuiarJTtB+dUSTF6YCXtb 4gBuEanOnsoyeLHTUTsA8SQ2Pw/gPnQyHp/6iqwhBtiVYzDo6qiiuvRTQY/ghA32D3PF8xK3ZNL5u QULJ5KZgLP7FHKK+EDFo4ja5+fExZRrSYjrAMbjOQVCmSnHHiBX1UGw6BPnFu2RCufOcTzFg4fPjo pNZGp5lQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lA8ih-0000EB-5A; Thu, 11 Feb 2021 09:57:07 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lA8if-0000Dj-MB for linux-arm-kernel@lists.infradead.org; Thu, 11 Feb 2021 09:57:06 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lA8ib-0004VP-1m; Thu, 11 Feb 2021 09:57:01 +0000 From: Colin King To: Michael Turquette , Stephen Boyd , Michal Simek , Michael Tretter , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH][next][V2] soc: xilinx: vcu: fix error check on clk_hw_get_parent call Date: Thu, 11 Feb 2021 09:57:00 +0000 Message-Id: <20210211095700.158960-1-colin.king@canonical.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210211_045705_825299_C4320E45 X-CRM114-Status: GOOD ( 12.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Colin Ian King Currently the check for failur on the call to clk_hw_get_parent is checking for a null return in the divider pointer instead of checking the mux pointer. Fix this. Thanks to Michael Tretter for suggesting the correct fix. Addresses-Coverity: ("Logically Dead Code") Fixes: 9c789deea206 ("soc: xilinx: vcu: implement clock provider for output clocks") Signed-off-by: Colin Ian King --- V2: Check on mux pointer rather than removing deadcode that wasn't actually really dead code. --- drivers/clk/xilinx/xlnx_vcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/xilinx/xlnx_vcu.c b/drivers/clk/xilinx/xlnx_vcu.c index d66b1315114e..256b8c4b9ee4 100644 --- a/drivers/clk/xilinx/xlnx_vcu.c +++ b/drivers/clk/xilinx/xlnx_vcu.c @@ -512,7 +512,7 @@ static void xvcu_clk_hw_unregister_leaf(struct clk_hw *hw) mux = clk_hw_get_parent(divider); clk_hw_unregister_mux(mux); - if (!divider) + if (!mux) return; clk_hw_unregister_divider(divider);