Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 284079
b: refs/heads/master
c: 748b217
h: refs/heads/master
i:
  284077: a98c4bb
  284075: cd74556
  284071: f46db52
  284063: 7204264
v: v3
  • Loading branch information
Axel Lin authored and Mark Brown committed Jan 2, 2012
1 parent e9119a4 commit 64d6e24
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c49c7f0cf91c8506d0a0ed61227a0da3b243384d
refs/heads/master: 748b217827974d34a7341142599f0db631a3e45a
8 changes: 6 additions & 2 deletions trunk/sound/soc/codecs/wm8580.c
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ static int wm8580_set_sysclk(struct snd_soc_dai *dai, int clk_id,
{
struct snd_soc_codec *codec = dai->codec;
struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
int sel, sel_mask, sel_shift;
int ret, sel, sel_mask, sel_shift;

switch (dai->driver->id) {
case WM8580_DAI_PAIFRX:
Expand Down Expand Up @@ -711,7 +711,11 @@ static int wm8580_set_sysclk(struct snd_soc_dai *dai, int clk_id,
/* We really should validate PLL settings but not yet */
wm8580->sysclk[dai->driver->id] = freq;

return snd_soc_update_bits(codec, WM8580_CLKSEL, sel_mask, sel);
ret = snd_soc_update_bits(codec, WM8580_CLKSEL, sel_mask, sel);
if (ret < 0)
return ret;

return 0;
}

static int wm8580_digital_mute(struct snd_soc_dai *codec_dai, int mute)
Expand Down

0 comments on commit 64d6e24

Please sign in to comment.