summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wcd9335.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-04-23 19:01:02 +0100
committerMark Brown <broonie@kernel.org>2021-04-23 19:01:02 +0100
commitffc9841d5200a484ea0ecc645157b4d7b873f3a6 (patch)
treec5216df939963608cefcd94bdf2934a2b880b54d /sound/soc/codecs/wcd9335.c
parentd143a69fd452a047440391fcbe290ff416b14ab5 (diff)
parent25c4a9b614f101bb9f3e687960815db7dc439c0f (diff)
downloadlinux-ffc9841d5200a484ea0ecc645157b4d7b873f3a6.tar.bz2
Merge remote-tracking branch 'asoc/for-5.13' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wcd9335.c')
-rw-r--r--sound/soc/codecs/wcd9335.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c
index 9ddfed797b7e..86c92e03ea5d 100644
--- a/sound/soc/codecs/wcd9335.c
+++ b/sound/soc/codecs/wcd9335.c
@@ -2058,7 +2058,7 @@ static int wcd9335_get_channel_map(struct snd_soc_dai *dai,
return 0;
}
-static struct snd_soc_dai_ops wcd9335_dai_ops = {
+static const struct snd_soc_dai_ops wcd9335_dai_ops = {
.hw_params = wcd9335_hw_params,
.trigger = wcd9335_trigger,
.set_channel_map = wcd9335_set_channel_map,
@@ -5213,7 +5213,7 @@ static int wcd9335_slim_status(struct slim_device *sdev,
wcd9335_probe(wcd);
- return ret;
+ return 0;
}
static const struct slim_device_id wcd9335_slim_id[] = {