diff options
author | Takashi Iwai | 2015-04-13 10:23:18 +0200 |
---|---|---|
committer | Takashi Iwai | 2015-04-13 10:23:18 +0200 |
commit | 9a4f35865ffcb2f4603375eadabe0d475fab1a0f (patch) | |
tree | 1465ac717deee029d3a9c1f7235ba85be57feefa /sound/soc/intel/haswell.c | |
parent | ALSA: usb-audio: Don't attempt to get Microsoft Lifecam Cinema sample rate (diff) | |
parent | ALSA: control: Fix a typo of SNDRV_CTL_ELEM_ACCESS_TLV_* with SNDRV_CTL_TLV_OP_* (diff) | |
download | kernel-qcow2-linux-9a4f35865ffcb2f4603375eadabe0d475fab1a0f.tar.gz kernel-qcow2-linux-9a4f35865ffcb2f4603375eadabe0d475fab1a0f.tar.xz kernel-qcow2-linux-9a4f35865ffcb2f4603375eadabe0d475fab1a0f.zip |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/intel/haswell.c')
-rw-r--r-- | sound/soc/intel/haswell.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/intel/haswell.c b/sound/soc/intel/haswell.c index 35edf51a52aa..00fddd3f5dfb 100644 --- a/sound/soc/intel/haswell.c +++ b/sound/soc/intel/haswell.c @@ -56,9 +56,7 @@ static int haswell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, channels->min = channels->max = 2; /* set SSP0 to 16 bit */ - snd_mask_set(¶ms->masks[SNDRV_PCM_HW_PARAM_FORMAT - - SNDRV_PCM_HW_PARAM_FIRST_MASK], - SNDRV_PCM_FORMAT_S16_LE); + params_set_format(params, SNDRV_PCM_FORMAT_S16_LE); return 0; } |