ALSA: msnd: Fix the default sample sizes

tiwai · gregkh · commit 5993f94d351d · 2018-09-26T08:36:30.000+02:00
[ Upstream commit 7c500f9ea139d0c9b80fdea5a9c911db3166ea54 ]

The default sample sizes set by msnd driver are bogus; it sets ALSA
PCM format, not the actual bit width.

Signed-off-by: Takashi Iwai &lt;tiwai@suse.de&gt;
Signed-off-by: Sasha Levin &lt;alexander.levin@microsoft.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c
@@ -82,10 +82,10 @@
 
 static void set_default_audio_parameters(struct snd_msnd *chip)
 {
-	chip->play_sample_size = DEFSAMPLESIZE;
+	chip->play_sample_size = snd_pcm_format_width(DEFSAMPLESIZE);
 	chip->play_sample_rate = DEFSAMPLERATE;
 	chip->play_channels = DEFCHANNELS;
-	chip->capture_sample_size = DEFSAMPLESIZE;
+	chip->capture_sample_size = snd_pcm_format_width(DEFSAMPLESIZE);
 	chip->capture_sample_rate = DEFSAMPLERATE;
 	chip->capture_channels = DEFCHANNELS;
 }

Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,10 @@`
`82`	`82`
`83`	`83`	`static void set_default_audio_parameters(struct snd_msnd *chip)`
`84`	`84`	`{`
`85`		`- chip->play_sample_size = DEFSAMPLESIZE;`
	`85`	`+ chip->play_sample_size = snd_pcm_format_width(DEFSAMPLESIZE);`
`86`	`86`	`chip->play_sample_rate = DEFSAMPLERATE;`
`87`	`87`	`chip->play_channels = DEFCHANNELS;`
`88`		`- chip->capture_sample_size = DEFSAMPLESIZE;`
	`88`	`+ chip->capture_sample_size = snd_pcm_format_width(DEFSAMPLESIZE);`
`89`	`89`	`chip->capture_sample_rate = DEFSAMPLERATE;`
`90`	`90`	`chip->capture_channels = DEFCHANNELS;`
`91`	`91`	`}`