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=-12.8 required=3.0 tests=BAYES_00,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=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 5F7C0C433DF for ; Mon, 17 Aug 2020 15:30:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2132C2065C for ; Mon, 17 Aug 2020 15:30:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597678225; bh=18Kb9L0d2/YacLQLp9iqHZqdiB+gKYnwcnzOM4HUAIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Sbs5Txde8KInPhUA3O7qZV19S7VKYHFTGLWjfLPNLmG4d+ZbwKmjhcPwziCS8EMI/ GIpbQ1WY8GJ4a2vNC2MxX4GG2wOQFyx3//+/mo2402GvQWEjfF3QMr27gi1nvpzLqM 50X7dRsdzVVwCED339WW0mWsJ6YKFMdFq8GurLeA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730173AbgHQPaS (ORCPT ); Mon, 17 Aug 2020 11:30:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:50884 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729448AbgHQPaL (ORCPT ); Mon, 17 Aug 2020 11:30:11 -0400 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 B96292395B; Mon, 17 Aug 2020 15:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597678210; bh=18Kb9L0d2/YacLQLp9iqHZqdiB+gKYnwcnzOM4HUAIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yGN5AMccL33DU83UCvymJkosL90izRs+k1D7QUkWO9TXxZp4YTKy2OQ3NX0+Ekm5M jAmN7mfefk8lVzZMSbkz6A85HNL2mrnxZsyPVcy8aISQ3ZNEraYoRyJjumRRKmZrNn H6yrrkMpNtjokl7NSdDJLOeJhZ7iyxVLok/X8LGk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuhong Yuan , Douglas Anderson , Ulf Hansson , Sasha Levin Subject: [PATCH 5.8 225/464] mmc: sdhci-of-arasan: Add missed checks for devm_clk_register() Date: Mon, 17 Aug 2020 17:12:58 +0200 Message-Id: <20200817143844.574706188@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@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: Chuhong Yuan [ Upstream commit c99e1d0c91ac8d7db3062ea1af315f21295701d7 ] These functions do not check the return value of devm_clk_register(): - sdhci_arasan_register_sdcardclk() - sdhci_arasan_register_sampleclk() Therefore, add the missed checks to fix them. Fixes: c390f2110adf1 ("mmc: sdhci-of-arasan: Add ability to export card clock") Signed-off-by: Chuhong Yuan Reviewed-by: Douglas Anderson Link: https://lore.kernel.org/r/20200608162226.3259186-1-hslester96@gmail.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci-of-arasan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c index db9b544465cda..fb26e743e1fd4 100644 --- a/drivers/mmc/host/sdhci-of-arasan.c +++ b/drivers/mmc/host/sdhci-of-arasan.c @@ -1299,6 +1299,8 @@ sdhci_arasan_register_sdcardclk(struct sdhci_arasan_data *sdhci_arasan, clk_data->sdcardclk_hw.init = &sdcardclk_init; clk_data->sdcardclk = devm_clk_register(dev, &clk_data->sdcardclk_hw); + if (IS_ERR(clk_data->sdcardclk)) + return PTR_ERR(clk_data->sdcardclk); clk_data->sdcardclk_hw.init = NULL; ret = of_clk_add_provider(np, of_clk_src_simple_get, @@ -1349,6 +1351,8 @@ sdhci_arasan_register_sampleclk(struct sdhci_arasan_data *sdhci_arasan, clk_data->sampleclk_hw.init = &sampleclk_init; clk_data->sampleclk = devm_clk_register(dev, &clk_data->sampleclk_hw); + if (IS_ERR(clk_data->sampleclk)) + return PTR_ERR(clk_data->sampleclk); clk_data->sampleclk_hw.init = NULL; ret = of_clk_add_provider(np, of_clk_src_simple_get, -- 2.25.1