diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:39 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:39 +0100 |
| commit | a86ba28583987b85845ed61be5f12aafb5fc4971 (patch) | |
| tree | de3fd39d3921ade6fd1a42508841483f1f25c82d /sound/pci | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
| parent | ad6cfc2ac71180171e090e69ae8762ac511884b1 (diff) | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 4 | ||||
| -rw-r--r-- | sound/pci/via82xx.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 1305f7ca02c..641d7f07392 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -1821,7 +1821,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]) { diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 8a332d2f615..03d6aea1974 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c @@ -1791,6 +1791,12 @@ static struct ac97_quirk ac97_quirks[] = { .type = AC97_TUNE_HP_ONLY }, { + .subvendor = 0x110a, + .subdevice = 0x0079, + .name = "Fujitsu Siemens D1289", + .type = AC97_TUNE_HP_ONLY + }, + { .subvendor = 0x1019, .subdevice = 0x0a81, .name = "ECS K7VTA3", |