2 files changed, 31 insertions, 15 deletions

diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index d746750410ea..442b081cafb7 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -49,6 +49,7 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;  /* Enable this card */
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* 0x220,0x240,0x260 */
+static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;  /* Usually 0x388 */
 static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
 static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;        /* 5,7,9,10 */
 static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;    /* 5,7,9,10 */
@@ -65,6 +66,8 @@ MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
 module_param_array(mpu_port, long, NULL, 0444);
 MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");
 module_param_array(irq, int, NULL, 0444);
+module_param_array(fm_port, long, NULL, 0444);
+MODULE_PARM_DESC(fm_port, "FM port # for ES1688 driver.");
 MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");
 module_param_array(mpu_irq, int, NULL, 0444);
 MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");
@@ -143,13 +146,19 @@ static int __devinit snd_es1688_probe(struct device *dev, unsigned int n)
         sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name,
                 chip->port, chip->irq, chip->dma8);
 
-        if (snd_opl3_create(card, chip->port, chip->port + 2,
-                        OPL3_HW_OPL3, 0, &opl3) < 0)
-                dev_warn(dev, "opl3 not detected at 0x%lx\n", chip->port);
-        else {
-                error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
-                if (error < 0)
-                        goto out;
+        if (fm_port[n] == SNDRV_AUTO_PORT)
+                fm_port[n] = port[n];   /* share the same port */
+
+        if (fm_port[n] > 0) {
+                if (snd_opl3_create(card, fm_port[n], fm_port[n] + 2,
+                                OPL3_HW_OPL3, 0, &opl3) < 0)
+                        dev_warn(dev,
+                                 "opl3 not detected at 0x%lx\n", fm_port[n]);
+                else {
+                        error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
+                        if (error < 0)
+                                goto out;
+                }
         }
 
         if (mpu_irq[n] >= 0 && mpu_irq[n] != SNDRV_AUTO_IRQ &&
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 4fbb508a817f..4c6e14f87f2d 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -45,7 +45,7 @@ static int snd_es1688_dsp_command(struct snd_es1688 *chip, unsigned char val)
                         return 1;
                 }
 #ifdef CONFIG_SND_DEBUG
-        printk("snd_es1688_dsp_command: timeout (0x%x)\n", val);
+        printk(KERN_DEBUG "snd_es1688_dsp_command: timeout (0x%x)\n", val);
 #endif
         return 0;
 }
@@ -167,13 +167,16 @@ static int snd_es1688_probe(struct snd_es1688 *chip)
         hw = ES1688_HW_AUTO;
         switch (chip->version & 0xfff0) {
         case 0x4880:
-                snd_printk("[0x%lx] ESS: AudioDrive ES488 detected, but driver is in another place\n", chip->port);
+                snd_printk(KERN_ERR "[0x%lx] ESS: AudioDrive ES488 detected, "
+                           "but driver is in another place\n", chip->port);
                 return -ENODEV;
         case 0x6880:
                 hw = (chip->version & 0x0f) >= 8 ? ES1688_HW_1688 : ES1688_HW_688;
                 break;
         default:
-                snd_printk("[0x%lx] ESS: unknown AudioDrive chip with version 0x%x (Jazz16 soundcard?)\n", chip->port, chip->version);
+                snd_printk(KERN_ERR "[0x%lx] ESS: unknown AudioDrive chip "
+                           "with version 0x%x (Jazz16 soundcard?)\n",
+                           chip->port, chip->version);
                 return -ENODEV;
         }
 
@@ -223,7 +226,7 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
                 }
         }
 #if 0
-        snd_printk("mpu cfg = 0x%x\n", cfg);
+        snd_printk(KERN_DEBUG "mpu cfg = 0x%x\n", cfg);
 #endif
         spin_lock_irqsave(&chip->reg_lock, flags);
         snd_es1688_mixer_write(chip, 0x40, cfg);
@@ -237,7 +240,9 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
                 cfg = 0xf0;     /* enable only DMA counter interrupt */
                 irq_bits = irqs[chip->irq & 0x0f];
                 if (irq_bits < 0) {
-                        snd_printk("[0x%lx] ESS: bad IRQ %d for ES1688 chip!!\n", chip->port, chip->irq);
+                        snd_printk(KERN_ERR "[0x%lx] ESS: bad IRQ %d "
+                                   "for ES1688 chip!!\n",
+                                   chip->port, chip->irq);
 #if 0
                         irq_bits = 0;
                         cfg = 0x10;
@@ -250,7 +255,8 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
                 cfg = 0xf0;     /* extended mode DMA enable */
                 dma = chip->dma8;
                 if (dma > 3 || dma == 2) {
-                        snd_printk("[0x%lx] ESS: bad DMA channel %d for ES1688 chip!!\n", chip->port, dma);
+                        snd_printk(KERN_ERR "[0x%lx] ESS: bad DMA channel %d "
+                                   "for ES1688 chip!!\n", chip->port, dma);
 #if 0
                         dma_bits = 0;
                         cfg = 0x00;     /* disable all DMA */
@@ -341,8 +347,9 @@ static int snd_es1688_trigger(struct snd_es1688 *chip, int cmd, unsigned char va
                 return -EINVAL; /* something is wrong */
         }
 #if 0
-        printk("trigger: val = 0x%x, value = 0x%x\n", val, value);
-        printk("trigger: pointer = 0x%x\n", snd_dma_pointer(chip->dma8, chip->dma_size));
+        printk(KERN_DEBUG "trigger: val = 0x%x, value = 0x%x\n", val, value);
+        printk(KERN_DEBUG "trigger: pointer = 0x%x\n",
+               snd_dma_pointer(chip->dma8, chip->dma_size));
 #endif
         snd_es1688_write(chip, 0xb8, (val & 0xf0) | value);
         spin_unlock(&chip->reg_lock);