From 64d6e24d159dc5dc1e9b95dd308195e24dd4c7a2 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 30 Dec 2011 23:36:23 +0800 Subject: [PATCH] --- yaml --- r: 284079 b: refs/heads/master c: 748b217827974d34a7341142599f0db631a3e45a h: refs/heads/master i: 284077: a98c4bb04e1b152598ba8720685d0d17ab5dc8da 284075: cd7455606faadb0df12eb635c5892da07e980e9a 284071: f46db5200dbf0df1c25974b34df53315fb9318c8 284063: 7204264f530797a2adb86795b535531c92c876b5 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8580.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 74df8cd7ab79..af5a5749fe48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c49c7f0cf91c8506d0a0ed61227a0da3b243384d +refs/heads/master: 748b217827974d34a7341142599f0db631a3e45a diff --git a/trunk/sound/soc/codecs/wm8580.c b/trunk/sound/soc/codecs/wm8580.c index b1c8d3de08b2..211285164d70 100644 --- a/trunk/sound/soc/codecs/wm8580.c +++ b/trunk/sound/soc/codecs/wm8580.c @@ -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: @@ -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)