2 files changed, 20 insertions, 14 deletions

diff --git a/sound/isa/gus/gus_irq.c b/sound/isa/gus/gus_irq.c
index a0430b338d67..cd9a6f1c99e6 100644
--- a/sound/isa/gus/gus_irq.c
+++ b/sound/isa/gus/gus_irq.c
@@ -45,11 +45,13 @@ __again:
         // snd_printk("IRQ: status = 0x%x\n", status);
         if (status & 0x02) {
                 STAT_ADD(gus->gf1.interrupt_stat_midi_in);
-                gus->gf1.interrupt_handler_midi_in(gus);
+                if (gus->gf1.interrupt_handler_midi_in)
+                        gus->gf1.interrupt_handler_midi_in(gus);
         }
         if (status & 0x01) {
                 STAT_ADD(gus->gf1.interrupt_stat_midi_out);
-                gus->gf1.interrupt_handler_midi_out(gus);
+                if (gus->gf1.interrupt_handler_midi_out)
+                        gus->gf1.interrupt_handler_midi_out(gus);
         }
         if (status & (0x20 | 0x40)) {
                 unsigned int already, _current_;
@@ -85,20 +87,24 @@ __again:
         }
         if (status & 0x04) {
                 STAT_ADD(gus->gf1.interrupt_stat_timer1);
-                gus->gf1.interrupt_handler_timer1(gus);
+                if (gus->gf1.interrupt_handler_timer1)
+                        gus->gf1.interrupt_handler_timer1(gus);
         }
         if (status & 0x08) {
                 STAT_ADD(gus->gf1.interrupt_stat_timer2);
-                gus->gf1.interrupt_handler_timer2(gus);
+                if (gus->gf1.interrupt_handler_timer2)
+                        gus->gf1.interrupt_handler_timer2(gus);
         }
         if (status & 0x80) {
                 if (snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL) & 0x40) {
                         STAT_ADD(gus->gf1.interrupt_stat_dma_write);
-                        gus->gf1.interrupt_handler_dma_write(gus);
+                        if (gus->gf1.interrupt_handler_dma_write)
+                                gus->gf1.interrupt_handler_dma_write(gus);
                 }
                 if (snd_gf1_i_look8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL) & 0x40) {
                         STAT_ADD(gus->gf1.interrupt_stat_dma_read);
-                        gus->gf1.interrupt_handler_dma_read(gus);
+                        if (gus->gf1.interrupt_handler_dma_read)
+                                gus->gf1.interrupt_handler_dma_read(gus);
                 }
         }
         if (--loop > 0)
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index ada9209a93a6..b14d5d6d9a32 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -154,6 +154,14 @@ int snd_gus_create(struct snd_card *card,
         gus = kzalloc(sizeof(*gus), GFP_KERNEL);
         if (gus == NULL)
                 return -ENOMEM;
+        spin_lock_init(&gus->reg_lock);
+        spin_lock_init(&gus->voice_alloc);
+        spin_lock_init(&gus->active_voice_lock);
+        spin_lock_init(&gus->event_lock);
+        spin_lock_init(&gus->dma_lock);
+        spin_lock_init(&gus->pcm_volume_level_lock);
+        spin_lock_init(&gus->uart_cmd_lock);
+        mutex_init(&gus->dma_mutex);
         gus->gf1.irq = -1;
         gus->gf1.dma1 = -1;
         gus->gf1.dma2 = -1;
@@ -218,14 +226,6 @@ int snd_gus_create(struct snd_card *card,
         gus->gf1.pcm_channels = pcm_channels;
         gus->gf1.volume_ramp = 25;
         gus->gf1.smooth_pan = 1;
-        spin_lock_init(&gus->reg_lock);
-        spin_lock_init(&gus->voice_alloc);
-        spin_lock_init(&gus->active_voice_lock);
-        spin_lock_init(&gus->event_lock);
-        spin_lock_init(&gus->dma_lock);
-        spin_lock_init(&gus->pcm_volume_level_lock);
-        spin_lock_init(&gus->uart_cmd_lock);
-        mutex_init(&gus->dma_mutex);
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, gus, &ops)) < 0) {
                 snd_gus_free(gus);
                 return err;