From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756734Ab2HOUTi (ORCPT ); Wed, 15 Aug 2012 16:19:38 -0400 Received: from mail1.windriver.com ([147.11.146.13]:62956 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756701Ab2HOTu6 (ORCPT ); Wed, 15 Aug 2012 15:50:58 -0400 From: Paul Gortmaker To: , CC: Axel Lin , Mark Brown , Paul Gortmaker Subject: [v2.6.34-stable 086/165] ASoC: wm8940: Properly set codec->dapm.bias_level Date: Wed, 15 Aug 2012 15:47:10 -0400 Message-ID: <1345060109-9187-87-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 1.7.12.rc2 In-Reply-To: <1345060109-9187-1-git-send-email-paul.gortmaker@windriver.com> References: <1345060109-9187-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Axel Lin ------------------- This is a commit scheduled for the next v2.6.34 longterm release. http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git If you see a problem with using this for longterm, please comment. ------------------- commit 5927f94700e860ae27ff24e7f3bc9e4f7b9922eb upstream. Reported-by: Chris Paulson-Ellis Signed-off-by: Axel Lin Signed-off-by: Mark Brown [PG: in .34 it uses codec->bias_level and not codec->dapm.bias_level] Signed-off-by: Paul Gortmaker --- sound/soc/codecs/wm8940.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 0c04b47..0dab4fe 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -473,6 +473,8 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec, break; } + codec->bias_level = level; + return ret; } -- 1.7.12.rc2