lkml.org 
[lkml]   [2010]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] sound/oss/vidc.c: change the field used with DMA_ACTIVE
    At Thu, 18 Mar 2010 07:53:11 +0100 (CET),
    Julia Lawall wrote:
    >
    > From: Julia Lawall <julia@diku.dk>
    >
    > 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 <julia@diku.dk>

    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);
    >


    \
     
     \ /
      Last update: 2010-03-21 09:41    [W:0.019 / U:3.664 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site