diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /sound/pci/echoaudio | |
parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) |
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 2783ce6c236e..8dab82d7d19d 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) | |||
1864 | /* The hardware doesn't tell us which substream caused the irq, | 1864 | /* The hardware doesn't tell us which substream caused the irq, |
1865 | thus we have to check all running substreams. */ | 1865 | thus we have to check all running substreams. */ |
1866 | for (ss = 0; ss < DSP_MAXPIPES; ss++) { | 1866 | for (ss = 0; ss < DSP_MAXPIPES; ss++) { |
1867 | if ((substream = chip->substream[ss])) { | 1867 | substream = chip->substream[ss]; |
1868 | if (substream && ((struct audiopipe *)substream->runtime-> | ||
1869 | private_data)->state == PIPE_STATE_STARTED) { | ||
1868 | period = pcm_pointer(substream) / | 1870 | period = pcm_pointer(substream) / |
1869 | substream->runtime->period_size; | 1871 | substream->runtime->period_size; |
1870 | if (period != chip->last_period[ss]) { | 1872 | if (period != chip->last_period[ss]) { |