summaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-09 10:51:45 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-09 10:51:45 +0200
commitc8bdfacb63c85d39ff55d365f1e48cce011b219e (patch)
tree402f659bdb919064dd7bced98c59de63994abe03 /sound/isa
parentadd7c0a6a4b8669ebd726f9c08ba6002900ca671 (diff)
parenta7a13d0676335a7dc9dd72264cca02606e43aaba (diff)
downloadlinux-c8bdfacb63c85d39ff55d365f1e48cce011b219e.tar.gz
linux-c8bdfacb63c85d39ff55d365f1e48cce011b219e.tar.bz2
linux-c8bdfacb63c85d39ff55d365f1e48cce011b219e.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/msnd/msnd_pinnacle.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c
index 5f3e68401f90..91d6023a63e5 100644
--- a/sound/isa/msnd/msnd_pinnacle.c
+++ b/sound/isa/msnd/msnd_pinnacle.c
@@ -764,9 +764,9 @@ static long io[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
static long mem[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+#ifndef MSND_CLASSIC
static long cfg[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
-#ifndef MSND_CLASSIC
/* Extra Peripheral Configuration (Default: Disable) */
static long ide_io0[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
static long ide_io1[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
@@ -894,7 +894,11 @@ static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx)
struct snd_card *card;
struct snd_msnd *chip;
- if (has_isapnp(idx) || cfg[idx] == SNDRV_AUTO_PORT) {
+ if (has_isapnp(idx)
+#ifndef MSND_CLASSIC
+ || cfg[idx] == SNDRV_AUTO_PORT
+#endif
+ ) {
printk(KERN_INFO LOGNAME ": Assuming PnP mode\n");
return -ENODEV;
}