Skip to content

Commit 8b53253

Browse files
marcanjannau
authored andcommitted
macaudio: Initialize speaker lock properly
Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent be7f32b commit 8b53253

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

sound/soc/apple/macaudio.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,6 +1095,8 @@ static int macaudio_late_probe(struct snd_soc_card *card)
10951095
ma->speaker_sample_rate_kctl = snd_soc_card_get_kcontrol(card, "Speaker Sample Rate");
10961096
ma->speaker_lock_kctl = snd_soc_card_get_kcontrol(card, "Speaker Volume Unlock");
10971097

1098+
macaudio_vlimit_unlock(ma, false);
1099+
10981100
return 0;
10991101
}
11001102

@@ -1138,8 +1140,6 @@ static int macaudio_j313_fixup_controls(struct snd_soc_card *card) {
11381140
* what macOS sets.
11391141
*/
11401142
CHECK(snd_soc_limit_volume, "* Amp Gain Volume", 14);
1141-
1142-
macaudio_vlimit_update(ma);
11431143
}
11441144

11451145
return 0;
@@ -1166,8 +1166,6 @@ static int macaudio_j314_fixup_controls(struct snd_soc_card *card)
11661166
*/
11671167
CHECK(snd_soc_set_enum_kctl, "* OCE Handling", "Retry");
11681168
CHECK(snd_soc_deactivate_kctl, "* OCE Handling", 0);
1169-
1170-
macaudio_vlimit_update(ma);
11711169
}
11721170

11731171
return 0;
@@ -1207,8 +1205,6 @@ static int macaudio_j375_fixup_controls(struct snd_soc_card *card)
12071205

12081206
if (ma->has_speakers) {
12091207
CHECK(snd_soc_limit_volume, "* Amp Gain Volume", 14); // 20 set by macOS, this is 3 dB below
1210-
1211-
macaudio_vlimit_update(ma);
12121208
}
12131209

12141210
return 0;
@@ -1224,8 +1220,6 @@ static int macaudio_j493_fixup_controls(struct snd_soc_card *card)
12241220

12251221
if (ma->has_speakers) {
12261222
CHECK(snd_soc_limit_volume, "* Amp Gain Volume", 9); // 15 set by macOS, this is 3 dB below
1227-
1228-
macaudio_vlimit_update(ma);
12291223
}
12301224

12311225
return 0;

0 commit comments

Comments
 (0)