ALSA: sound/arm: Fix build failure caused by missing struct aaci definition (903b0eb3) · Commits · 戴 / test

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:

sound/arm/aaci.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;