diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 14:24:46 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 14:24:46 +0100 |
| commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
| tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /sound/pci/echoaudio | |
| parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
| parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) | |
| download | op-kernel-dev-7fb3a069bc5d3577409c2ae89f89cd264ff85816.zip op-kernel-dev-7fb3a069bc5d3577409c2ae89f89cd264ff85816.tar.gz | |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/pci/echoaudio')
| -rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 2783ce6..8dab82d 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -1864,7 +1864,9 @@ static irqreturn_t snd_echo_interrupt(int irq, void *dev_id) /* The hardware doesn't tell us which substream caused the irq, thus we have to check all running substreams. */ for (ss = 0; ss < DSP_MAXPIPES; ss++) { - if ((substream = chip->substream[ss])) { + substream = chip->substream[ss]; + if (substream && ((struct audiopipe *)substream->runtime-> + private_data)->state == PIPE_STATE_STARTED) { period = pcm_pointer(substream) / substream->runtime->period_size; if (period != chip->last_period[ss]) { |
