summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-07-25 23:00:48 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-26 08:37:59 +0200
commitf402334e5d328c9480f32ded3fe3bfeba53ac7fb (patch)
tree41511656278e3dcd7a9dd324447741b2f23688ab /sound
parent918cad16b45810da7b0d0fa605377630fa9ebedd (diff)
downloadlinux-stable-f402334e5d328c9480f32ded3fe3bfeba53ac7fb.tar.gz
linux-stable-f402334e5d328c9480f32ded3fe3bfeba53ac7fb.tar.bz2
linux-stable-f402334e5d328c9480f32ded3fe3bfeba53ac7fb.zip
ALSA: msnd: Fix the default sample sizes
[ 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 <tiwai@suse.de> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/msnd/msnd_pinnacle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c
index 45e561c425bf..a3cf837c0ffd 100644
--- 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;
}