vserver 2.0 rc7

[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 4b560a7..05f1629 100644 (file)
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2079,14 +2079,7 @@ static int snd_ymfpci_free(ymfpci_t *chip)
                release_resource(chip->fm_res);
                kfree_nocheck(chip->fm_res);
        }
-#ifdef SUPPORT_JOYSTICK
-       if (chip->joystick_res) {
-               if (chip->gameport.io)
-                       gameport_unregister_port(&chip->gameport);
-               release_resource(chip->joystick_res);
-               kfree_nocheck(chip->joystick_res);
-       }
-#endif
+       snd_ymfpci_free_gameport(chip);
        if (chip->reg_area_virt)
                iounmap(chip->reg_area_virt);
        if (chip->work_ptr.area)
@@ -2142,7 +2135,7 @@ static int saved_regs_index[] = {
 };
 #define YDSXGR_NUM_SAVED_REGS  ARRAY_SIZE(saved_regs_index)
 
-static int snd_ymfpci_suspend(snd_card_t *card, unsigned int state)
+static int snd_ymfpci_suspend(snd_card_t *card, pm_message_t state)
 {
        ymfpci_t *chip = card->pm_private_data;
        unsigned int i;
@@ -2161,7 +2154,7 @@ static int snd_ymfpci_suspend(snd_card_t *card, unsigned int state)
        return 0;
 }
 
-static int snd_ymfpci_resume(snd_card_t *card, unsigned int state)
+static int snd_ymfpci_resume(snd_card_t *card)
 {
        ymfpci_t *chip = card->pm_private_data;
        unsigned int i;