diff options
| author | Mark Brown <broonie@kernel.org> | 2020-05-12 16:12:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-05-12 16:12:47 +0100 |
| commit | 132a0eb0324025bb4691ee590996dbe302159298 (patch) | |
| tree | e70fcc3c1294f36f184f17b46bd82131cf71b686 /sound/soc/sof | |
| parent | 66c705d07d784fb6b4622c6e47b6acae357472db (diff) | |
| parent | 74fcfde748b26c68a8ab2791d9d73f698f7752d1 (diff) | |
Merge branch 'for-5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.8
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/control.c | 4 | ||||
| -rw-r--r-- | sound/soc/sof/sof-audio.h | 2 | ||||
| -rw-r--r-- | sound/soc/sof/topology.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/sof/control.c b/sound/soc/sof/control.c index 97d5aca45de8..186eea105bb1 100644 --- a/sound/soc/sof/control.c +++ b/sound/soc/sof/control.c @@ -19,8 +19,8 @@ static void update_mute_led(struct snd_sof_control *scontrol, struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - unsigned int temp = 0; - unsigned int mask; + int temp = 0; + int mask; int i; mask = 1U << snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h index 41e2abd077e6..9629994fe463 100644 --- a/sound/soc/sof/sof-audio.h +++ b/sound/soc/sof/sof-audio.h @@ -56,7 +56,7 @@ struct snd_sof_pcm { struct snd_sof_led_control { unsigned int use_led; unsigned int direction; - unsigned int led_value; + int led_value; }; /* ALSA SOF Kcontrol device */ diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 42d1b1e55e55..0259537d3740 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1244,6 +1244,8 @@ static int sof_control_load(struct snd_soc_component *scomp, int index, return ret; } + scontrol->led_ctl.led_value = -1; + dobj->private = scontrol; list_add(&scontrol->list, &sdev->kcontrol_list); return ret; |