Received: by 2002:a19:f614:0:0:0:0:0 with SMTP id x20csp54128lfe; Fri, 15 Apr 2022 19:09:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYRC3GP3FLZKIMQ8PULcQu9tHka1aRJGagRB1+l4FEZ4rILJXgv98OOqRlF7tNvvcYiRuT X-Received: by 2002:a17:903:1104:b0:154:c628:e7c2 with SMTP id n4-20020a170903110400b00154c628e7c2mr1577810plh.54.1650074968089; Fri, 15 Apr 2022 19:09:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650074968; cv=none; d=google.com; s=arc-20160816; b=q085wWz4guAbaEfq42g5zDf0lxoURKR1dkHuZwC/Al3WuokCBxeFWhntemnIdQcRO1 TuDor9e8OHbJ0gsDvLsqdW80h0flu0azVwCoaAz7AbWpNXI2hjJIms2joyf+k4BiZvC5 g9gK3df2DZ0K+QPjO4OiUCSPjPQp5iS5rVi0p8B8TM6Zy/lxJcAGarJqlT6pKeNHzEj0 NQSFRv//5BCFX5d3V8yWht4ghXdbFY+hURxPZbuYdwyvwoqAsS3yEYGMr021nExz99ie GkDvaR+tTMcPLdv43/mMSoybgXWd4TpVZesRFfod6QDiMceDlreS0w7sibsWjxGEVyix ezmQ== 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=E4sPSrCuT45pDvu1JsZ1yKJyF4WPz4YOZsRq9zlcYzQ=; b=AeT1VPecOp2QbtwUXzcj1iPbn5jIsgzFEFwHvMNWy4cj4rKf8Mnbmbb/CWyr2LWgPH OCsYG3A691GeUfnUvq1VS4DotDQruRJueytLUPlMgFG8yeL1yG2mHbSJyoJWH9p7ObVS j0ww/cVlY4ldh3unccBhNLhZoA/+gp7mJ9xraDNzXzOsmnTdLBFEJaaWQq7vNFjxv9UT 0ZawGPJ+9LZx5oNe5RL55JxK2Fnljtt/78k4fw9uCIu5TOJWu7DM6hLspEneP5KSMa1v 06zkYyaykFx1nliWBPLAADQjq4SE5/bn77s1tnlOwvEf/ldvYfIuuoeQnNPv+BiCKPMW aqkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="HLbR/2Zi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id f8-20020a056a00238800b00508327796f8si3287632pfc.41.2022.04.15.19.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 19:09:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="HLbR/2Zi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BA28D48338; Fri, 15 Apr 2022 18:27:05 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232667AbiDNN0x (ORCPT + 99 others); Thu, 14 Apr 2022 09:26:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244223AbiDNNYG (ORCPT ); Thu, 14 Apr 2022 09:24:06 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2FB69AE6C; Thu, 14 Apr 2022 06:18:53 -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 ams.source.kernel.org (Postfix) with ESMTPS id 5A761B8296A; Thu, 14 Apr 2022 13:18:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8327C385A1; Thu, 14 Apr 2022 13:18:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649942331; bh=NAcl7/luNxaqo7WGAyVzIXBeNq36zhOZfxuDr7K0cYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HLbR/2ZifaCo/ISYp6GG1t4t3RzWaY0BrhUNRTq5FKTMH5zpzfS2if2iXIvBg17EV cXOTFt5I0KYHRyOiNYemacZIbqFNSNNGADhKBEuNZ315apONmSI/VsLxBuDBEMTwtx TADvDaY2UtiwGbHIt3yIPnJ9UvK06Cdsc8YABQa4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiasheng Jiang , Takashi Iwai , Sasha Levin Subject: [PATCH 4.19 096/338] ALSA: spi: Add check for clk_enable() Date: Thu, 14 Apr 2022 15:09:59 +0200 Message-Id: <20220414110841.631089139@linuxfoundation.org> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220414110838.883074566@linuxfoundation.org> References: <20220414110838.883074566@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=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 ca1697eb09208f0168d94b88b72f57505339cbe5 ] As the potential failure of the clk_enable(), it should be better to check it and return error if fails. Fixes: 3568459a5113 ("ALSA: at73c213: manage SSC clock") Signed-off-by: Jiasheng Jiang Link: https://lore.kernel.org/r/20220228022839.3547266-1-jiasheng@iscas.ac.cn Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/spi/at73c213.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c index 1ef52edeb538..3763f06ed784 100644 --- a/sound/spi/at73c213.c +++ b/sound/spi/at73c213.c @@ -221,7 +221,9 @@ static int snd_at73c213_pcm_open(struct snd_pcm_substream *substream) runtime->hw = snd_at73c213_playback_hw; chip->substream = substream; - clk_enable(chip->ssc->clk); + err = clk_enable(chip->ssc->clk); + if (err) + return err; return 0; } @@ -787,7 +789,9 @@ static int snd_at73c213_chip_init(struct snd_at73c213 *chip) goto out; /* Enable DAC master clock. */ - clk_enable(chip->board->dac_clk); + retval = clk_enable(chip->board->dac_clk); + if (retval) + goto out; /* Initialize at73c213 on SPI bus. */ retval = snd_at73c213_write_reg(chip, DAC_RST, 0x04); @@ -900,7 +904,9 @@ static int snd_at73c213_dev_init(struct snd_card *card, chip->card = card; chip->irq = -1; - clk_enable(chip->ssc->clk); + retval = clk_enable(chip->ssc->clk); + if (retval) + return retval; retval = request_irq(irq, snd_at73c213_interrupt, 0, "at73c213", chip); if (retval) { @@ -1019,7 +1025,9 @@ static int snd_at73c213_remove(struct spi_device *spi) int retval; /* Stop playback. */ - clk_enable(chip->ssc->clk); + retval = clk_enable(chip->ssc->clk); + if (retval) + goto out; ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXDIS)); clk_disable(chip->ssc->clk); @@ -1099,9 +1107,16 @@ static int snd_at73c213_resume(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct snd_at73c213 *chip = card->private_data; + int retval; - clk_enable(chip->board->dac_clk); - clk_enable(chip->ssc->clk); + retval = clk_enable(chip->board->dac_clk); + if (retval) + return retval; + retval = clk_enable(chip->ssc->clk); + if (retval) { + clk_disable(chip->board->dac_clk); + return retval; + } ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXEN)); return 0; -- 2.34.1