]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
ALSA: spi: Add check for clk_enable()
authorJiasheng Jiang <jiasheng@iscas.ac.cn>
Mon, 28 Feb 2022 02:28:39 +0000 (10:28 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 13:18:42 +0000 (15:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1971497
[ 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 <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20220228022839.3547266-1-jiasheng@iscas.ac.cn
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
sound/spi/at73c213.c

index 4de1ba9a418d990bc8d4d06edcbf589bc8cb1d98..6e5d315bab59b1be1d9a621d4b9fd712b270d1f2 100644 (file)
@@ -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;
 }
@@ -784,7 +786,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);
@@ -897,7 +901,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) {
@@ -1016,7 +1022,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);
 
@@ -1096,9 +1104,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;