fixup! macaudio: Skip speaker sense PCM if no sense or no speakers

marcan · marcan · commit fb14f6b6cce3 · 2023-11-07T21:16:19.000+09:00
diff --git a/sound/soc/apple/macaudio.c b/sound/soc/apple/macaudio.c
@@ -570,7 +570,7 @@ static int macaudio_parse_of(struct macaudio_snd_data *ma)
 				continue;
 			}
 			ma->has_speakers = 1;
-			if (ma->cfg->amp != AMP_SSM3515)
+			if (ma->cfg->amp != AMP_SSM3515 && ma->cfg->safe_vol != 0)
 				ma->has_sense = 1;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ static int macaudio_parse_of(struct macaudio_snd_data *ma)`
`570`	`570`	`continue;`
`571`	`571`	`}`
`572`	`572`	`ma->has_speakers = 1;`
`573`		`- if (ma->cfg->amp != AMP_SSM3515)`
	`573`	`+ if (ma->cfg->amp != AMP_SSM3515 && ma->cfg->safe_vol != 0)`
`574`	`574`	`ma->has_sense = 1;`
`575`	`575`	`}`
`576`	`576`