Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/fix/wm5100' into tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Jan 10, 2013
2 parents 921c038 + 5f96029 commit 49a170b
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions sound/soc/codecs/wm5100.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 49a170b

Please sign in to comment.