diff options
| author | Mark Brown <broonie@kernel.org> | 2022-07-11 16:51:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-07-11 16:51:01 +0200 |
| commit | 39c5c44fc451c083908e77c3b2762fae2bf8acca (patch) | |
| tree | 6e3c05c56e48fa9d29ad1f89614e9f0ef48459d4 /sound/soc/codecs/cs47l92.c | |
| parent | ASoC: fsl_utils: Drop usage of __clk_get_name() (diff) | |
| parent | ASoC: rockchip: i2s: Fix NULL pointer dereference when pinctrl is not found (diff) | |
| download | linux-39c5c44fc451c083908e77c3b2762fae2bf8acca.tar.xz linux-39c5c44fc451c083908e77c3b2762fae2bf8acca.zip | |
ASoC: Merge up fixes
Needed for the Rockchip driver.
Diffstat (limited to 'sound/soc/codecs/cs47l92.c')
| -rw-r--r-- | sound/soc/codecs/cs47l92.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c index 59da34b480a8..fe576d64e089 100644 --- a/sound/soc/codecs/cs47l92.c +++ b/sound/soc/codecs/cs47l92.c @@ -119,7 +119,13 @@ static int cs47l92_put_demux(struct snd_kcontrol *kcontrol, end: snd_soc_dapm_mutex_unlock(dapm); - return snd_soc_dapm_mux_update_power(dapm, kcontrol, mux, e, NULL); + ret = snd_soc_dapm_mux_update_power(dapm, kcontrol, mux, e, NULL); + if (ret < 0) { + dev_err(madera->dev, "Failed to update demux power state: %d\n", ret); + return ret; + } + + return change; } static SOC_ENUM_SINGLE_DECL(cs47l92_outdemux_enum, |