From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752092Ab0CUIiT (ORCPT ); Sun, 21 Mar 2010 04:38:19 -0400 Received: from cantor.suse.de ([195.135.220.2]:43796 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751267Ab0CUIiR (ORCPT ); Sun, 21 Mar 2010 04:38:17 -0400 Date: Sun, 21 Mar 2010 09:38:16 +0100 Message-ID: From: Takashi Iwai To: Julia Lawall Cc: rmk@arm.linux.org.uk, perex@perex.cz, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] sound/oss/vidc.c: change the field used with DMA_ACTIVE In-Reply-To: References: 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 At Thu, 18 Mar 2010 07:53:11 +0100 (CET), Julia Lawall wrote: > > From: Julia Lawall > > The constant DMA_ACTIVE is defined with the dma_buffparams structure rather > than with the audio_operations structure. Takashi Iwai suggested that the > dmap_out field of the audio_operations structure should be used instead. > > This is not tested. > > Signed-off-by: Julia Lawall Applied now. Thanks. Takashi > > --- > sound/oss/vidc.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c > index 725fef0..a4127ba 100644 > --- a/sound/oss/vidc.c > +++ b/sound/oss/vidc.c > @@ -363,13 +363,13 @@ static void vidc_audio_trigger(int dev, int enable_bits) > struct audio_operations *adev = audio_devs[dev]; > > if (enable_bits & PCM_ENABLE_OUTPUT) { > - if (!(adev->flags & DMA_ACTIVE)) { > + if (!(adev->dmap_out->flags & DMA_ACTIVE)) { > unsigned long flags; > > local_irq_save(flags); > > /* prevent recusion */ > - adev->flags |= DMA_ACTIVE; > + adev->dmap_out->flags |= DMA_ACTIVE; > > dma_interrupt = vidc_audio_dma_interrupt; > vidc_sound_dma_irq(0, NULL); >