[alsa-devel] [PATCH 2/2] ALSA: AACI: fix recording bug
pcm->r[1].slots is the double rate slot information, not the capture information. For capture, 'pcm' will already be the capture ac97 pcm structure.
Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk --- sound/arm/aaci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 1456fc7..eb715e7 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -518,7 +518,7 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream, else err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params), params_channels(params), - aacirun->pcm->r[1].slots); + aacirun->pcm->r[0].slots);
if (err) goto out;
At Sun, 29 Nov 2009 16:39:59 +0000, Russell King - ARM Linux wrote:
pcm->r[1].slots is the double rate slot information, not the capture information. For capture, 'pcm' will already be the capture ac97 pcm structure.
Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk
sound/arm/aaci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 1456fc7..eb715e7 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -518,7 +518,7 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream, else err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params), params_channels(params),
aacirun->pcm->r[1].slots);
aacirun->pcm->r[0].slots);
Then we can get rid of the whole if check and the else block here. The arguments to be passed are identical for both playback and capture directions.
thanks,
Takashi
On Mon, Nov 30, 2009 at 10:51:39AM +0100, Takashi Iwai wrote:
At Sun, 29 Nov 2009 16:39:59 +0000, Russell King - ARM Linux wrote:
pcm->r[1].slots is the double rate slot information, not the capture information. For capture, 'pcm' will already be the capture ac97 pcm structure.
Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk
sound/arm/aaci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 1456fc7..eb715e7 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -518,7 +518,7 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream, else err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params), params_channels(params),
aacirun->pcm->r[1].slots);
aacirun->pcm->r[0].slots);Then we can get rid of the whole if check and the else block here. The arguments to be passed are identical for both playback and capture directions.
Yes. That's a cleanup patch (and as such a separate patch). Since we're this late in the -rc cycle, I'd prefer to do just minimal changes.
At Mon, 30 Nov 2009 10:22:28 +0000, Russell King - ARM Linux wrote:
On Mon, Nov 30, 2009 at 10:51:39AM +0100, Takashi Iwai wrote:
At Sun, 29 Nov 2009 16:39:59 +0000, Russell King - ARM Linux wrote:
pcm->r[1].slots is the double rate slot information, not the capture information. For capture, 'pcm' will already be the capture ac97 pcm structure.
Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk
sound/arm/aaci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 1456fc7..eb715e7 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -518,7 +518,7 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream, else err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params), params_channels(params),
aacirun->pcm->r[1].slots);
aacirun->pcm->r[0].slots);Then we can get rid of the whole if check and the else block here. The arguments to be passed are identical for both playback and capture directions.
Yes. That's a cleanup patch (and as such a separate patch). Since we're this late in the -rc cycle, I'd prefer to do just minimal changes.
Fair enough. Then I suppose it should be Cc'ed to stable kernel, too?
thanks,
Takashi
participants (2)
-
Russell King - ARM Linux -
Takashi Iwai