diff options
| author | Mark Brown <broonie@kernel.org> | 2017-02-19 16:35:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-02-19 16:35:34 +0000 |
| commit | 5bf3db18db32d57c269c21e73df6a3621a30f6fc (patch) | |
| tree | 6030a6c2b09ce970189967ae77ec170a7e404d67 /sound/soc/intel/atom/sst-atom-controls.c | |
| parent | 19532a24773a7a7a988ffbab805b05ad7e564115 (diff) | |
| parent | f12f5c84e35c7b66dbc5066a46b502b832b69669 (diff) | |
| download | linux-5bf3db18db32d57c269c21e73df6a3621a30f6fc.tar.gz | |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Diffstat (limited to 'sound/soc/intel/atom/sst-atom-controls.c')
| -rw-r--r-- | sound/soc/intel/atom/sst-atom-controls.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c index c7b3cbf92faf..df4430bdafc0 100644 --- a/sound/soc/intel/atom/sst-atom-controls.c +++ b/sound/soc/intel/atom/sst-atom-controls.c @@ -801,13 +801,11 @@ static int sst_get_frame_sync_polarity(struct snd_soc_dai *dai, switch (format) { case SND_SOC_DAIFMT_NB_NF: - return SSP_FS_ACTIVE_LOW; - case SND_SOC_DAIFMT_NB_IF: + case SND_SOC_DAIFMT_IB_NF: return SSP_FS_ACTIVE_HIGH; + case SND_SOC_DAIFMT_NB_IF: case SND_SOC_DAIFMT_IB_IF: return SSP_FS_ACTIVE_LOW; - case SND_SOC_DAIFMT_IB_NF: - return SSP_FS_ACTIVE_HIGH; default: dev_err(dai->dev, "Invalid frame sync polarity %d\n", format); } |