This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / sound / pci / ymfpci / ymfpci_main.c

diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 87214a0..1603169 100644 (file)
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2085,7 +2085,7 @@ static int snd_ymfpci_free(ymfpci_t *chip)
        }
 #endif
        if (chip->reg_area_virt)
-               iounmap(chip->reg_area_virt);
+               iounmap((void *)chip->reg_area_virt);
        if (chip->work_ptr.area)
                snd_dma_free_pages(&chip->work_ptr);
        
@@ -2098,7 +2098,6 @@ static int snd_ymfpci_free(ymfpci_t *chip)
 
        pci_write_config_word(chip->pci, 0x40, chip->old_legacy_ctrl);
        
-       pci_disable_device(chip->pci);
        kfree(chip);
        return 0;
 }
@@ -2154,7 +2153,6 @@ static int snd_ymfpci_suspend(snd_card_t *card, unsigned int state)
        chip->saved_ydsxgr_mode = snd_ymfpci_readl(chip, YDSXGR_MODE);
        snd_ymfpci_writel(chip, YDSXGR_NATIVEDACOUTVOL, 0);
        snd_ymfpci_disable_dsp(chip);
-       pci_disable_device(chip->pci);
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
        return 0;
 }
@@ -2206,10 +2204,8 @@ int __devinit snd_ymfpci_create(snd_card_t * card,
                return err;
 
        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
-       if (chip == NULL) {
-               pci_disable_device(pci);
+       if (chip == NULL)
                return -ENOMEM;
-       }
        chip->old_legacy_ctrl = old_legacy_ctrl;
        spin_lock_init(&chip->reg_lock);
        spin_lock_init(&chip->voice_lock);
@@ -2221,7 +2217,7 @@ int __devinit snd_ymfpci_create(snd_card_t * card,
        chip->device_id = pci->device;
        pci_read_config_byte(pci, PCI_REVISION_ID, (u8 *)&chip->rev);
        chip->reg_area_phys = pci_resource_start(pci, 0);
-       chip->reg_area_virt = ioremap_nocache(chip->reg_area_phys, 0x8000);
+       chip->reg_area_virt = (unsigned long)ioremap_nocache(chip->reg_area_phys, 0x8000);
        pci_set_master(pci);
 
        if ((chip->res_reg_area = request_mem_region(chip->reg_area_phys, 0x8000, "YMFPCI")) == NULL) {