Skip to content

Commit

Permalink
Merge branches 'fix/arizona', 'fix/core', 'fix/cs42l52', 'fix/mxs', '…
Browse files Browse the repository at this point in the history
…fix/samsung' and 'fix/wm8978' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into tmp
  • Loading branch information
Mark Brown committed Nov 13, 2012
7 parents 77b6706 + fe81ad1 + d055852 + 5c855c8 + f55f147 + 6268f74 + 55c6f4c commit ba027da
Show file tree
Hide file tree
Showing 8 changed files with 573 additions and 12 deletions.
3 changes: 1 addition & 2 deletions sound/soc/codecs/cs42l52.c
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,6 @@ static int cs42l52_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
{
struct snd_soc_codec *codec = codec_dai->codec;
struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec);
int ret = 0;
u8 iface = 0;

switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
Expand Down Expand Up @@ -822,7 +821,7 @@ static int cs42l52_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
case SND_SOC_DAIFMT_NB_IF:
break;
default:
ret = -EINVAL;
return -EINVAL;
}
cs42l52->config.format = iface;
snd_soc_write(codec, CS42L52_IFACE_CTL1, cs42l52->config.format);
Expand Down
Loading

0 comments on commit ba027da

Please sign in to comment.