Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp1022679pxb; Wed, 6 Apr 2022 06:58:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxw+I8opmpVjfkKwsrMhrhAu07GJIOjkuw6Tfw40R5dbGT1eiqAs2iljsUxYp1nR7DFkG+/ X-Received: by 2002:a17:90a:b115:b0:1ca:9d56:24f9 with SMTP id z21-20020a17090ab11500b001ca9d5624f9mr10079429pjq.130.1649253535921; Wed, 06 Apr 2022 06:58:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649253535; cv=none; d=google.com; s=arc-20160816; b=MUVq8cpVCB0721HFRoJHJtgHRy8OCIMN6qfBMfiwzJ/AYRJB7OT6hfjmVILygT7hqj xhQu5O1SG84bjSKiZ/NyyJ/CRexq75uFxDzu99Qdci6mpSOadM3BOOVydgkM4VSeHhUU z+7EdJrUAG0y2zR2+1E5O4DTKaR/Rwj4/Ey9g8CaySLZkTw2IKyZ/B3Ns8BP4CFo+zTT dZEaqKCOb6bbSmDRShkBDVmr/96IYW/q3/Lhjp/3I8ybZzBojA2xmgMH8o3ztfpXtrsl fWXJd36xQxKEdwqCyA7+BAVpdzSrn7Dr5bkFP258HcTctYWVTe2vT+na8EF06lbcO1vI yedg== 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=oMKPlH0p1rQLeVtj19KzCSJBjHTU+BEIIoj2Lg+m8RA=; b=oRS/K3RI47lYq2FA+nBYR2caiYzzpeVl4gVcGb7paLyZ7WQWflwvYRMj3iCvir8fei 3Bx1x8rrujqYRIxK1qrjwd8YiAlGKiQ2MFb4p6MpzdhehFioSakTQ3jCtJ4CEn4bKf29 OS9k0y8B92Qa6L3cprtJRJKXJI8E/9GK29L4GOeu9PUxsix30ruSvcmGImhUJ9A9ammY iHDSN4HXWMYlHC8Avqcci2gHaaqakiB/Uz4QBqgLD1ZgS0XHFCSSCSuZ5TtGsqz1GpO4 /S6ydA7TDyBchl+NlgYZXgt1n14NF63eG/nwassid3ELkFZUz4DeODTQET1FDUhqQq4X AC5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rfq6Amor; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id 9-20020a631749000000b003816043f12csi16205467pgx.801.2022.04.06.06.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 06:58:55 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rfq6Amor; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0E76822EBF2; Wed, 6 Apr 2022 04:51:02 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1389590AbiDEWBz (ORCPT + 99 others); Tue, 5 Apr 2022 18:01:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357754AbiDEK1K (ORCPT ); Tue, 5 Apr 2022 06:27:10 -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 7CB2B3669C; Tue, 5 Apr 2022 03:10:42 -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 DFD356179E; Tue, 5 Apr 2022 10:10:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA459C385A0; Tue, 5 Apr 2022 10:10:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649153441; bh=YDTpRcSaCATao+L5CmLPyxK92OlmEXkjxf7243VK0CQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rfq6AmorgqP9bUpXce9Se+0Sg8ypmapPU1u2qHlAvNGpNjkBkhz3MQbfqWUqrSX4M npmy8UTjMH4YJGChDsvwjSC1Q+qhJNxpzSyxI2kOVNeSL+Hg2lwKc0HArj2qpz2pds Ff4c+ZUNJTPQOCBI4usfkuyaWv1NRy6Yb/0o/uwY= 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 5.10 224/599] ALSA: spi: Add check for clk_enable() Date: Tue, 5 Apr 2022 09:28:38 +0200 Message-Id: <20220405070305.508137239@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070258.802373272@linuxfoundation.org> References: <20220405070258.802373272@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 76c0e37a838c..8a2da6b1012e 100644 --- a/sound/spi/at73c213.c +++ b/sound/spi/at73c213.c @@ -218,7 +218,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; } @@ -776,7 +778,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); @@ -889,7 +893,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) { @@ -1008,7 +1014,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); @@ -1088,9 +1096,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