diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-31 20:03:10 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-31 20:03:10 +0000 |
| commit | 39d75485689de9abd2b27e9b2771c48db8e4be23 (patch) | |
| tree | cc6bc3f2644eec817c71c1d4222054f0b62ae7e6 /sound/soc/intel/atom | |
| parent | 5b101ab465c5c01b091c04b7fbaba6d912372947 (diff) | |
| parent | f12f5c84e35c7b66dbc5066a46b502b832b69669 (diff) | |
| download | blackbird-obmc-linux-39d75485689de9abd2b27e9b2771c48db8e4be23.tar.gz blackbird-obmc-linux-39d75485689de9abd2b27e9b2771c48db8e4be23.zip | |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel/atom')
| -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 0ce1d186cb68..0f3604b55942 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); } |
