Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751951AbZLZJ1S (ORCPT ); Sat, 26 Dec 2009 04:27:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751773AbZLZJ1R (ORCPT ); Sat, 26 Dec 2009 04:27:17 -0500 Received: from cantor.suse.de ([195.135.220.2]:44467 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751767AbZLZJ1R (ORCPT ); Sat, 26 Dec 2009 04:27:17 -0500 Date: Sat, 26 Dec 2009 10:27:15 +0100 Message-ID: From: Takashi Iwai To: Peter Huewe Cc: Russell King , Jaroslav Kysela , linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, peterhuewe@gmx.de Subject: Re: [PATCH] sound/arm: Fix build failure caused by missing struct aaci definition In-Reply-To: <200912260327.46099.PeterHuewe@gmx.de> References: <200912260327.46099.PeterHuewe@gmx.de> 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.1 (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 Content-Length: 2307 Lines: 67 At Sat, 26 Dec 2009 03:27:45 +0100, Peter Huewe wrote: > > From: Peter Huewe > > This patch fixes a build failure introduced by the patch > ALSA: AACI: factor common hw_params logic into aaci_pcm_hw_params [1] > by adding/moving the aaci struct to the right position. > > The patch mentioned above merged common source parts into one function, > but unfortunately left out the aaci struct and consequently caused a > build failure e.g. for arm versatile_config [2] > > References: > [1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=d3aee7996c30f928bbbbfd0994148e35d2e83084 > [2] http://kisskb.ellerman.id.au/kisskb/buildresult/1893605/ > > Patch against Linus' tree. > > Signed-off-by: Peter Huewe Thanks, applied now. Takashi > --- > sound/arm/aaci.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c > index c569986..656e474 100644 > --- a/sound/arm/aaci.c > +++ b/sound/arm/aaci.c > @@ -441,6 +441,7 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream, > struct snd_pcm_hw_params *params) > { > int err; > + struct aaci *aaci = substream->private_data; > > aaci_pcm_hw_free(substream); > if (aacirun->pcm_open) { > @@ -560,7 +561,6 @@ static int aaci_pcm_open(struct snd_pcm_substream *substream) > static int aaci_pcm_playback_hw_params(struct snd_pcm_substream *substream, > struct snd_pcm_hw_params *params) > { > - struct aaci *aaci = substream->private_data; > struct aaci_runtime *aacirun = substream->runtime->private_data; > unsigned int channels = params_channels(params); > int ret; > @@ -659,7 +659,6 @@ static struct snd_pcm_ops aaci_playback_ops = { > static int aaci_pcm_capture_hw_params(struct snd_pcm_substream *substream, > struct snd_pcm_hw_params *params) > { > - struct aaci *aaci = substream->private_data; > struct aaci_runtime *aacirun = substream->runtime->private_data; > int ret; > > -- > 1.6.4.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/