diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /sound/isa/gus/gus_pcm.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'sound/isa/gus/gus_pcm.c')
| -rw-r--r-- | sound/isa/gus/gus_pcm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c index d0829393ec8a..c7f95e7aa018 100644 --- a/sound/isa/gus/gus_pcm.c +++ b/sound/isa/gus/gus_pcm.c | |||
| @@ -114,8 +114,6 @@ static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream) | |||
| 114 | unsigned char pan; | 114 | unsigned char pan; |
| 115 | unsigned int voice; | 115 | unsigned int voice; |
| 116 | 116 | ||
| 117 | if (substream == NULL) | ||
| 118 | return; | ||
| 119 | spin_lock_irqsave(&pcmp->lock, flags); | 117 | spin_lock_irqsave(&pcmp->lock, flags); |
| 120 | if (pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE) { | 118 | if (pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE) { |
| 121 | spin_unlock_irqrestore(&pcmp->lock, flags); | 119 | spin_unlock_irqrestore(&pcmp->lock, flags); |