diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:57:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:57:50 +0200 |
| commit | 274035751e25ee15a064e43cde7b4e7a9b75d921 (patch) | |
| tree | bf5f3f18f14855043324ef02a116532d866e3dac /sound/soc/ux500 | |
| parent | ALSA: Remove transfer_ack_{begin,end} callbacks from struct snd_pcm_runtime (diff) | |
| parent | ASoC: cht_bsw_rt5672: Use snd_pcm_hw_constraint_single() (diff) | |
| download | linux-274035751e25ee15a064e43cde7b4e7a9b75d921.tar.xz linux-274035751e25ee15a064e43cde7b4e7a9b75d921.zip | |
Merge branch 'topic/hw-constraint-single' into for-next
Diffstat (limited to 'sound/soc/ux500')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 6ba8ae9ecc7a..6d5698b25bd4 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -522,9 +522,9 @@ static int ux500_msp_dai_hw_params(struct snd_pcm_substream *substream, slots_active = hweight32(mask); dev_dbg(dai->dev, "TDM-slots active: %d", slots_active); - snd_pcm_hw_constraint_minmax(runtime, + snd_pcm_hw_constraint_single(runtime, SNDRV_PCM_HW_PARAM_CHANNELS, - slots_active, slots_active); + slots_active); break; default: |