Merge remote-tracking branch 'asoc/fix/wm5100' into tmp

This commit is contained in:
Mark Brown
2013-01-10 12:22:30 +00:00

View File

@@ -1279,15 +1279,9 @@ static int wm5100_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
case SND_SOC_DAIFMT_DSP_A:
mask = 0;
break;
case SND_SOC_DAIFMT_DSP_B:
mask = 1;
break;
case SND_SOC_DAIFMT_I2S:
mask = 2;
break;
case SND_SOC_DAIFMT_LEFT_J:
mask = 3;
break;
default:
dev_err(codec->dev, "Unsupported DAI format %d\n",
fmt & SND_SOC_DAIFMT_FORMAT_MASK);