Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp391502pxb; Thu, 21 Apr 2022 01:47:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMWPrQ7FQ6oAonFYk0NzpCD8d4g1gpnXwXII74TNwT4SQ/glUZ3B8iML0ebmboZmSsQi38 X-Received: by 2002:a17:902:7684:b0:156:25b3:ef6b with SMTP id m4-20020a170902768400b0015625b3ef6bmr24437250pll.39.1650530849671; Thu, 21 Apr 2022 01:47:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650530849; cv=none; d=google.com; s=arc-20160816; b=W4xaDNxOiaTPfC5107zrGWEQypeV15TnBcFDPiR8e6EDrZiP1ckX8tY/sDqhAlyZX9 2XqkgQr4Ae6mdM22nxDDx5DtvCSQZ/kYTHtzOTjgLlw7INFcavcRjz0KljAucbePbNUp xZAnSfyQ7W52A0uqVE9g5wDyYphTqP0/7SP0ElZ6LBjVw/OjKCbSPZ4xNV8MqMOPYlfh lzhGHGyee/we04tirCMY1JaGo7wYXtuM1LCecONDyxdYPLPIU1lVTssxVnCRmUkZSzED YO7+T/0r4mBj3Ac2ROP6TpaN7F0KXY99YfF2HPiyNwSOomOBFK+a9q4cJWHKreB1oCDJ 8DCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WDzquLITCET9zem6So0otIQ69CCf4YJnbifWS7hAte0=; b=XoDOwpwkLdkz9lcSs3adOA9xYnq+q7k9jB3AsXCmQVOoLvVDOO1sQKYw3GgZaoNhMJ iMECsn5iyUb3oIdbxa6u8LDcj/LDbJL7S7qgQHqDmO0wOZvN0f+Hw8W91JzakMuVU1l1 EiWPHJFOJQ9jS7R9lmZJs0JD/pz1QJHZDBniJVzsoHfCAieRnQUu5lZBwU2LUJKVGmPr mowQFe+dYvENW2/6c7MJU1r4Du/8O8STbyCMkZpE4IBUx5yhppD5sWnw4sAIQGIFYTnz gzDpRHjTOswyyi9T2TOa36T5ZkYmH5J0GlOjnc/zOsdhJjx3Jdye1ViBmKAQUnRj1p09 WBPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wbfIvT80; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q21-20020a635055000000b0039d8f7b8a04si4327873pgl.669.2022.04.21.01.47.14; Thu, 21 Apr 2022 01:47:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wbfIvT80; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244520AbiDROQs (ORCPT + 99 others); Mon, 18 Apr 2022 10:16:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244606AbiDRN4y (ORCPT ); Mon, 18 Apr 2022 09:56:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 493DF2A734; Mon, 18 Apr 2022 06:05:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DB71060B42; Mon, 18 Apr 2022 13:05:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC88FC385A7; Mon, 18 Apr 2022 13:05:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1650287134; bh=3CgcAMqJTWG/rh9tZWq/btmcwy2kL2QhkhYPfFqd/YQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wbfIvT80L1tqFq1qJ1l4FatscWm4vlvmYjICSgdZB2r+NIkR3vNdf67nyVStSfK3E BqpFg0eWisayuPTbVXYo6I97EOyYPv8FeoD8NRzsLGWtZq3AHOgtsikUeLerl9Akuh 5jxiRsDp3tHcvP8dFsuuYKninq29xRM+wtyS2/Ao= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiasheng Jiang , Mark Brown , Sasha Levin Subject: [PATCH 4.9 066/218] ASoC: atmel_ssc_dai: Handle errors for clk_enable Date: Mon, 18 Apr 2022 14:12:12 +0200 Message-Id: <20220418121201.500077886@linuxfoundation.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220418121158.636999985@linuxfoundation.org> References: <20220418121158.636999985@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiasheng Jiang [ Upstream commit f9e2ca0640e59d19af0ff285ee5591ed39069b09 ] As the potential failure of the clk_enable(), it should be better to check it and return error if fals. Fixes: cbaadf0f90d6 ("ASoC: atmel_ssc_dai: refactor the startup and shutdown") Signed-off-by: Jiasheng Jiang Link: https://lore.kernel.org/r/20220301090637.3776558-1-jiasheng@iscas.ac.cn Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/atmel/atmel_ssc_dai.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 16e459aedffe..5958aafac8eb 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -296,7 +296,10 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, /* Enable PMC peripheral clock for this SSC */ pr_debug("atmel_ssc_dai: Starting clock\n"); - clk_enable(ssc_p->ssc->clk); + ret = clk_enable(ssc_p->ssc->clk); + if (ret) + return ret; + ssc_p->mck_rate = clk_get_rate(ssc_p->ssc->clk); /* Reset the SSC unless initialized to keep it in a clean state */ -- 2.34.1