diff options
| -rw-r--r-- | sound/soc/pxa/tavorevb3.c | 12 | 
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/pxa/tavorevb3.c b/sound/soc/pxa/tavorevb3.c index 56ee82f6118..8b5ab8f7272 100644 --- a/sound/soc/pxa/tavorevb3.c +++ b/sound/soc/pxa/tavorevb3.c @@ -92,16 +92,6 @@ static int evb3_i2s_hw_params(struct snd_pcm_substream *substream,  	if (ret < 0)  		return ret; -	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | -			SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); -	if (ret < 0) -		return ret; - -	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | -			SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); -	if (ret < 0) -		return ret; -  	ret = snd_soc_dai_set_tdm_slot(cpu_dai, 3, 3, 2, width);  	return ret;  } @@ -119,6 +109,8 @@ static struct snd_soc_dai_link evb3_dai[] = {  		.platform_name	= "pxa-pcm-audio",  		.codec_name	= "88pm860x-codec",  		.init		= evb3_pm860x_init, +		.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | +				  SND_SOC_DAIFMT_CBM_CFM,  		.ops		= &evb3_i2s_ops,  	},  };  |