1 files changed, 22 insertions, 11 deletions

diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 645491a53023..0481a55334b9 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -179,12 +179,13 @@ static unsigned char __snd_opl3sa2_read(struct snd_opl3sa2 *chip, unsigned char
         unsigned char result;
 #if 0
         outb(0x1d, port);       /* password */
-        printk("read [0x%lx] = 0x%x\n", port, inb(port));
+        printk(KERN_DEBUG "read [0x%lx] = 0x%x\n", port, inb(port));
 #endif
         outb(reg, chip->port);  /* register */
         result = inb(chip->port + 1);
 #if 0
-        printk("read [0x%lx] = 0x%x [0x%x]\n", port, result, inb(port));
+        printk(KERN_DEBUG "read [0x%lx] = 0x%x [0x%x]\n",
+               port, result, inb(port));
 #endif
         return result;
 }
@@ -233,7 +234,10 @@ static int __devinit snd_opl3sa2_detect(struct snd_card *card)
                 snd_printk(KERN_ERR PFX "can't grab port 0x%lx\n", port);
                 return -EBUSY;
         }
-        // snd_printk("REG 0A = 0x%x\n", snd_opl3sa2_read(chip, 0x0a));
+        /*
+        snd_printk(KERN_DEBUG "REG 0A = 0x%x\n",
+                   snd_opl3sa2_read(chip, 0x0a));
+        */
         chip->version = 0;
         tmp = snd_opl3sa2_read(chip, OPL3SA2_MISC);
         if (tmp == 0xff) {
@@ -477,6 +481,7 @@ OPL3SA2_DOUBLE_TLV("Master Playback Volume", 0, 0x07, 0x08, 0, 0, 15, 1,
 OPL3SA2_SINGLE("Mic Playback Switch", 0, 0x09, 7, 1, 1),
 OPL3SA2_SINGLE_TLV("Mic Playback Volume", 0, 0x09, 0, 31, 1,
                    db_scale_5bit_12db_max),
+OPL3SA2_SINGLE("ZV Port Switch", 0, 0x02, 0, 1, 0),
 };
 
 static struct snd_kcontrol_new snd_opl3sa2_tone_controls[] = {
@@ -550,21 +555,27 @@ static int __devinit snd_opl3sa2_mixer(struct snd_card *card)
 #ifdef CONFIG_PM
 static int snd_opl3sa2_suspend(struct snd_card *card, pm_message_t state)
 {
-        struct snd_opl3sa2 *chip = card->private_data;
+        if (card) {
+                struct snd_opl3sa2 *chip = card->private_data;
 
-        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        chip->wss->suspend(chip->wss);
-        /* power down */
-        snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3);
+                snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+                chip->wss->suspend(chip->wss);
+                /* power down */
+                snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3);
+        }
 
         return 0;
 }
 
 static int snd_opl3sa2_resume(struct snd_card *card)
 {
-        struct snd_opl3sa2 *chip = card->private_data;
+        struct snd_opl3sa2 *chip;
         int i;
 
+        if (!card)
+                return 0;
+
+        chip = card->private_data;
         /* power up */
         snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D0);
 
@@ -613,7 +624,7 @@ static void snd_opl3sa2_free(struct snd_card *card)
 {
         struct snd_opl3sa2 *chip = card->private_data;
         if (chip->irq >= 0)
-                free_irq(chip->irq, (void *)chip);
+                free_irq(chip->irq, card);
         release_and_free_resource(chip->res_port);
 }
 
@@ -628,7 +639,7 @@ static int snd_opl3sa2_card_new(int dev, struct snd_card **cardp)
         if (err < 0)
                 return err;
         strcpy(card->driver, "OPL3SA2");
-        strcpy(card->shortname, "Yamaha OPL3-SA2");
+        strcpy(card->shortname, "Yamaha OPL3-SA");
         chip = card->private_data;
         spin_lock_init(&chip->reg_lock);
         chip->irq = -1;