]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/4.9.129/alsa-msnd-fix-the-default-sample-sizes.patch
4.14-stable patches
[thirdparty/kernel/stable-queue.git] / releases / 4.9.129 / alsa-msnd-fix-the-default-sample-sizes.patch
1 From foo@baz Fri Sep 21 09:36:02 CEST 2018
2 From: Takashi Iwai <tiwai@suse.de>
3 Date: Wed, 25 Jul 2018 23:00:48 +0200
4 Subject: ALSA: msnd: Fix the default sample sizes
5
6 From: Takashi Iwai <tiwai@suse.de>
7
8 [ Upstream commit 7c500f9ea139d0c9b80fdea5a9c911db3166ea54 ]
9
10 The default sample sizes set by msnd driver are bogus; it sets ALSA
11 PCM format, not the actual bit width.
12
13 Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
16 ---
17 sound/isa/msnd/msnd_pinnacle.c | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20 --- a/sound/isa/msnd/msnd_pinnacle.c
21 +++ b/sound/isa/msnd/msnd_pinnacle.c
22 @@ -82,10 +82,10 @@
23
24 static void set_default_audio_parameters(struct snd_msnd *chip)
25 {
26 - chip->play_sample_size = DEFSAMPLESIZE;
27 + chip->play_sample_size = snd_pcm_format_width(DEFSAMPLESIZE);
28 chip->play_sample_rate = DEFSAMPLERATE;
29 chip->play_channels = DEFCHANNELS;
30 - chip->capture_sample_size = DEFSAMPLESIZE;
31 + chip->capture_sample_size = snd_pcm_format_width(DEFSAMPLESIZE);
32 chip->capture_sample_rate = DEFSAMPLERATE;
33 chip->capture_channels = DEFCHANNELS;
34 }