diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2018-10-02 10:26:02 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 10:26:02 -0300 |
| commit | 5f3fecbc0715a70437501e1d85e74726c4f561be (patch) | |
| tree | f10a85be5659f9b2f8f3ca4aff41d8fd3aa01b37 /sound/isa/msnd | |
| parent | ded0ac8f40f9561d8ab2f8ef6c9ff8dc435f2b41 (diff) | |
| parent | c98b0c5db65001d10d7f0af026801b9c193c369e (diff) | |
Merge pull request #38 from gibsson/4.9-2.3.x-imx
Merge v4.9.130 into 4.9-2.3.x imx
Diffstat (limited to 'sound/isa/msnd')
| -rw-r--r-- | sound/isa/msnd/msnd_pinnacle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c index a31ea6c22d19..2d7379dec1f0 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; } |