vmap: cope with vm_unmap_aliases before vmalloc_init()

[linux-2.6-omap-h63xx.git] / sound / pci / ali5451 / ali5451.c

diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 6a905ed9cbd6e6f964db82cf2816888508624b5f..1a0fd65ec2809478d71f037f310f6a3f36a1823b 100644 (file)
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -1809,26 +1809,26 @@ static int snd_ali5451_spdif_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_ali *codec = kcontrol->private_data;
-       unsigned int enable;
+       unsigned int spdif_enable;
 
-       enable = ucontrol->value.integer.value[0] ? 1 : 0;
+       spdif_enable = ucontrol->value.integer.value[0] ? 1 : 0;
 
        spin_lock_irq(&codec->reg_lock);
        switch (kcontrol->private_value) {
        case 0:
-               enable = (codec->spdif_mask & 0x02) ? 1 : 0;
+               spdif_enable = (codec->spdif_mask & 0x02) ? 1 : 0;
                break;
        case 1:
-               enable = ((codec->spdif_mask & 0x02) &&
+               spdif_enable = ((codec->spdif_mask & 0x02) &&
                          (codec->spdif_mask & 0x04)) ? 1 : 0;
                break;
        case 2:
-               enable = (codec->spdif_mask & 0x01) ? 1 : 0;
+               spdif_enable = (codec->spdif_mask & 0x01) ? 1 : 0;
                break;
        default:
                break;
        }
-       ucontrol->value.integer.value[0] = enable;
+       ucontrol->value.integer.value[0] = spdif_enable;
        spin_unlock_irq(&codec->reg_lock);
        return 0;
 }
@@ -1837,17 +1837,17 @@ static int snd_ali5451_spdif_put(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_ali *codec = kcontrol->private_data;
-       unsigned int change = 0, enable = 0;
+       unsigned int change = 0, spdif_enable = 0;
 
-       enable = ucontrol->value.integer.value[0] ? 1 : 0;
+       spdif_enable = ucontrol->value.integer.value[0] ? 1 : 0;
 
        spin_lock_irq(&codec->reg_lock);
        switch (kcontrol->private_value) {
        case 0:
                change = (codec->spdif_mask & 0x02) ? 1 : 0;
-               change = change ^ enable;
+               change = change ^ spdif_enable;
                if (change) {
-                       if (enable) {
+                       if (spdif_enable) {
                                codec->spdif_mask |= 0x02;
                                snd_ali_enable_spdif_out(codec);
                        } else {
@@ -1859,9 +1859,9 @@ static int snd_ali5451_spdif_put(struct snd_kcontrol *kcontrol,
                break;
        case 1: 
                change = (codec->spdif_mask & 0x04) ? 1 : 0;
-               change = change ^ enable;
+               change = change ^ spdif_enable;
                if (change && (codec->spdif_mask & 0x02)) {
-                       if (enable) {
+                       if (spdif_enable) {
                                codec->spdif_mask |= 0x04;
                                snd_ali_enable_spdif_chnout(codec);
                        } else {
@@ -1872,9 +1872,9 @@ static int snd_ali5451_spdif_put(struct snd_kcontrol *kcontrol,
                break;
        case 2:
                change = (codec->spdif_mask & 0x01) ? 1 : 0;
-               change = change ^ enable;
+               change = change ^ spdif_enable;
                if (change) {
-                       if (enable) {
+                       if (spdif_enable) {
                                codec->spdif_mask |= 0x01;
                                snd_ali_enable_spdif_in(codec);
                        } else {
@@ -2047,10 +2047,8 @@ static int snd_ali_free(struct snd_ali * codec)
 {
        if (codec->hw_initialized)
                snd_ali_disable_address_interrupt(codec);
-       if (codec->irq >= 0) {
-               synchronize_irq(codec->irq);
+       if (codec->irq >= 0)
                free_irq(codec->irq, codec);
-       }
        if (codec->port)
                pci_release_regions(codec->pci);
        pci_disable_device(codec->pci);