aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTong Zhang <ztong0001@gmail.com>2020-08-24 18:45:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-09 19:12:32 +0200
commita3b94af5117bbbb2628be6d7df14cea805c5bf9b (patch)
tree5885cd0b9dceb34ecf9a3be3ed95d971d1459fb0
parent156dd7c73a9b0b16ced888a0c6abd6255a14ca8f (diff)
downloadlinux-yocto-a3b94af5117bbbb2628be6d7df14cea805c5bf9b.tar.gz
linux-yocto-a3b94af5117bbbb2628be6d7df14cea805c5bf9b.tar.bz2
linux-yocto-a3b94af5117bbbb2628be6d7df14cea805c5bf9b.zip
ALSA: ca0106: fix error code handling
commit ee0761d1d8222bcc5c86bf10849dc86cf008557c upstream. snd_ca0106_spi_write() returns 1 on error, snd_ca0106_pcm_power_dac() is returning the error code directly, and the caller is expecting an negative error code Signed-off-by: Tong Zhang <ztong0001@gmail.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200824224541.1260307-1-ztong0001@gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/pci/ca0106/ca0106_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 478412e0aa3c..7aedaeb7a196 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -537,7 +537,8 @@ static int snd_ca0106_pcm_power_dac(struct snd_ca0106 *chip, int channel_id,
else
/* Power down */
chip->spi_dac_reg[reg] |= bit;
- return snd_ca0106_spi_write(chip, chip->spi_dac_reg[reg]);
+ if (snd_ca0106_spi_write(chip, chip->spi_dac_reg[reg]) != 0)
+ return -ENXIO;
}
return 0;
}