Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block

[powerpc.git] / sound / pci / ymfpci / ymfpci.c

diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index 9f3ef22..1bbba32 100644 (file)
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -130,8 +130,7 @@ static int __devinit snd_ymfpci_create_gameport(ymfpci_t *chip, int dev,
        chip->gameport = gp = gameport_allocate_port();
        if (!gp) {
                printk(KERN_ERR "ymfpci: cannot allocate memory for gameport\n");
-               release_resource(r);
-               kfree_nocheck(r);
+               release_and_free_resource(r);
                return -ENOMEM;
        }
 
@@ -161,8 +160,7 @@ void snd_ymfpci_free_gameport(ymfpci_t *chip)
                gameport_unregister_port(chip->gameport);
                chip->gameport = NULL;
 
-               release_resource(r);
-               kfree_nocheck(r);
+               release_and_free_resource(r);
        }
 }
 #else
@@ -267,14 +265,8 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
                                     old_legacy_ctrl,
                                     &chip)) < 0) {
                snd_card_free(card);
-               if (mpu_res) {
-                       release_resource(mpu_res);
-                       kfree_nocheck(mpu_res);
-               }
-               if (fm_res) {
-                       release_resource(fm_res);
-                       kfree_nocheck(fm_res);
-               }
+               release_and_free_resource(mpu_res);
+               release_and_free_resource(fm_res);
                return err;
        }
        chip->fm_res = fm_res;
@@ -328,7 +320,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
                        pci_write_config_word(pci, PCIR_DSXG_LEGACY, legacy_ctrl);
                } else if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
                        snd_card_free(card);
-                       snd_printk("cannot create opl3 hwdep\n");
+                       snd_printk(KERN_ERR "cannot create opl3 hwdep\n");
                        return err;
                }
        }
@@ -352,6 +344,7 @@ static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
 
 static struct pci_driver driver = {
        .name = "Yamaha DS-XG PCI",
+       .owner = THIS_MODULE,
        .id_table = snd_ymfpci_ids,
        .probe = snd_card_ymfpci_probe,
        .remove = __devexit_p(snd_card_ymfpci_remove),
@@ -360,7 +353,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_ymfpci_init(void)
 {
-       return pci_module_init(&driver);
+       return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_ymfpci_exit(void)