From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753355Ab1LUPpY (ORCPT ); Wed, 21 Dec 2011 10:45:24 -0500 Received: from cantor2.suse.de ([195.135.220.15]:54781 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752874Ab1LUPpX (ORCPT ); Wed, 21 Dec 2011 10:45:23 -0500 Date: Wed, 21 Dec 2011 16:45:21 +0100 Message-ID: From: Takashi Iwai To: Linus Torvalds Cc: linux-kernel@vger.kernel.org Subject: [GIT PULL] sound fix for 3.2-rc7 User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus, please pull a sound fix for v3.2-rc7 from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus The topmost commit is 8015e3defe491d305b20c2e64b154b999e6da065 Only a single commit at this time. A good sign, isn't it? Thanks! Takashi === Bo Shen (1): ALSA: atmel/ac97c: using software reset instead hardware reset if not available --- sound/atmel/ac97c.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 6e5adde..73516f6 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -899,6 +899,10 @@ static void atmel_ac97c_reset(struct atmel_ac97c *chip) /* AC97 v2.2 specifications says minimum 1 us. */ udelay(2); gpio_set_value(chip->reset_pin, 1); + } else { + ac97c_writel(chip, MR, AC97C_MR_WRST | AC97C_MR_ENA); + udelay(2); + ac97c_writel(chip, MR, AC97C_MR_ENA); } }