summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorXinyu Chen <xinyu.chen@freescale.com>2012-07-31 14:12:06 +0800
committerXinyu Chen <xinyu.chen@freescale.com>2012-07-31 14:20:23 +0800
commit4aebe485cfac86ebd945377c4398c625e3305b5d (patch)
tree675f7768fba60fb2b87f13ec0d0ac30f39cfa035 /sound
parent931a3957fbb80bfcef833848a3404d3a0943e6c9 (diff)
ENGR00217401-1 wm8962: fix build warning
Fix two build warnings on wm8962 Signed-off-by: Xinyu Chen <Xinyu.chen@freescale.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8962.c2
-rw-r--r--sound/soc/imx/imx-wm8962.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 190720ec029d..8558be580ee3 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3414,7 +3414,7 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
unsigned int Fref, unsigned int Fout)
{
struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
- struct _fll_div fll_div;
+ struct _fll_div fll_div = {0};
unsigned long timeout;
int ret;
int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1) & WM8962_FLL_ENA;
diff --git a/sound/soc/imx/imx-wm8962.c b/sound/soc/imx/imx-wm8962.c
index 76299a659b41..de0dcd60a594 100644
--- a/sound/soc/imx/imx-wm8962.c
+++ b/sound/soc/imx/imx-wm8962.c
@@ -88,7 +88,6 @@ static int imx_hifi_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
- struct snd_soc_codec *codec = rtd->codec;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai = rtd->codec_dai;
struct imx_priv *priv = &card_priv;