Pull bugzilla-7897 into release branch

[sfrench/cifs-2.6.git] / sound / isa / gus / gus_pcm.c

diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index d0829393ec8a21b6ad0a3d8589ab5b417724086f..c7f95e7aa018513be58cc557a6a984369085bf6e 100644 (file)
--- 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)
        unsigned char pan;
        unsigned int voice;
 
-       if (substream == NULL)
-               return;
        spin_lock_irqsave(&pcmp->lock, flags);
        if (pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE) {
                spin_unlock_irqrestore(&pcmp->lock, flags);