projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eba0154
)
ALSA: ca0106: fix error code handling
author
Tong Zhang
<ztong0001@gmail.com>
Mon, 24 Aug 2020 22:45:41 +0000
(18:45 -0400)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sat, 12 Sep 2020 09:47:36 +0000
(11:47 +0200)
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>
sound/pci/ca0106/ca0106_main.c
patch
|
blob
|
history
diff --git
a/sound/pci/ca0106/ca0106_main.c
b/sound/pci/ca0106/ca0106_main.c
index
6165a57
..
2c30a06
100644
(file)
--- a/
sound/pci/ca0106/ca0106_main.c
+++ b/
sound/pci/ca0106/ca0106_main.c
@@
-551,7
+551,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;
}