1 files changed, 5 insertions, 4 deletions

diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 72d85a5ae6a0..fbf1124f7c79 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -1635,20 +1635,20 @@ static int __devinit snd_ensoniq_1371_mixer(struct ensoniq *ensoniq,
         if (has_spdif > 0 ||
             (!has_spdif && es1371_quirk_lookup(ensoniq, es1371_spdif_present))) {
                 struct snd_kcontrol *kctl;
-                int i, index = 0;
+                int i, is_spdif = 0;
 
                 ensoniq->spdif_default = ensoniq->spdif_stream =
                         SNDRV_PCM_DEFAULT_CON_SPDIF;
                 outl(ensoniq->spdif_default, ES_REG(ensoniq, CHANNEL_STATUS));
 
                 if (ensoniq->u.es1371.ac97->ext_id & AC97_EI_SPDIF)
-                        index++;
+                        is_spdif++;
 
                 for (i = 0; i < ARRAY_SIZE(snd_es1371_mixer_spdif); i++) {
                         kctl = snd_ctl_new1(&snd_es1371_mixer_spdif[i], ensoniq);
                         if (!kctl)
                                 return -ENOMEM;
-                        kctl->id.index = index;
+                        kctl->id.index = is_spdif;
                         err = snd_ctl_add(card, kctl);
                         if (err < 0)
                                 return err;
@@ -1910,7 +1910,8 @@ static int snd_ensoniq_free(struct ensoniq *ensoniq)
         outl(0, ES_REG(ensoniq, CONTROL));      /* switch everything off */
         outl(0, ES_REG(ensoniq, SERIAL));       /* clear serial interface */
 #endif
-        synchronize_irq(ensoniq->irq);
+        if (ensoniq->irq >= 0)
+                synchronize_irq(ensoniq->irq);
         pci_set_power_state(ensoniq->pci, 3);
       __hw_end:
 #ifdef CHIP1370