From 0e2bb94661713668cdf57bfada92729753e5d8bf Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 28 Nov 2012 17:20:52 +0000 Subject: [PATCH] --- yaml --- r: 342684 b: refs/heads/master c: cac27cff066cf86c6fefe33d99d935e9d0d9c78c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm5102.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 59b1e8cca6a6..7b0de013662c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0644128556d7717c8f8df62897c951d729eca772 +refs/heads/master: cac27cff066cf86c6fefe33d99d935e9d0d9c78c diff --git a/trunk/sound/soc/codecs/wm5102.c b/trunk/sound/soc/codecs/wm5102.c index 5a1eb5b62fb5..760df353540d 100644 --- a/trunk/sound/soc/codecs/wm5102.c +++ b/trunk/sound/soc/codecs/wm5102.c @@ -1459,7 +1459,7 @@ static int __devinit wm5102_probe(struct platform_device *pdev) { struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); struct wm5102_priv *wm5102; - int i; + int i, ret; wm5102 = devm_kzalloc(&pdev->dev, sizeof(struct wm5102_priv), GFP_KERNEL); @@ -1478,6 +1478,10 @@ static int __devinit wm5102_probe(struct platform_device *pdev) wm5102->core.adsp[0].mem = wm5102_dsp1_regions; wm5102->core.adsp[0].num_mems = ARRAY_SIZE(wm5102_dsp1_regions); + ret = wm_adsp2_init(&wm5102->core.adsp[0], true); + if (ret != 0) + return ret; + for (i = 0; i < ARRAY_SIZE(wm5102->fll); i++) wm5102->fll[i].vco_mult = 1;