aboutsummaryrefslogtreecommitdiff
path: root/sound/isa/opl3sa2.c
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@suse.cz>2005-08-15 13:08:04 +0200
committerJaroslav Kysela <perex@suse.cz>2005-08-30 08:46:03 +0200
commitcff79742fc9e80242a9147a348621e4373c76287 (patch)
treee48f0b94b2790cae085cce6331e5bfb077b8abf6 /sound/isa/opl3sa2.c
parent3e6c6139f0cf9c196c3fd700055f2e22ca22e726 (diff)
downloadlinux-cff79742fc9e80242a9147a348621e4373c76287.tar.gz
[ALSA] opl3sa2 - use different name for PnP BIOS driver
OPL3SA2 driver - use different name (opl3sa2-pnpbios) for PnP BIOS driver - don't print warning when manual config of resources fails (PnP BIOS) Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/isa/opl3sa2.c')
-rw-r--r--sound/isa/opl3sa2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index bb5406cf0a19..75bd6eca63e7 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -607,7 +607,7 @@ static int __init snd_opl3sa2_pnp(int dev, opl3sa2_t *chip,
if (irq[dev] != SNDRV_AUTO_IRQ)
pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1);
err = pnp_manual_config_dev(pdev, cfg, 0);
- if (err < 0)
+ if (err < 0 && isapnp)
snd_printk(KERN_ERR "PnP manual resources are invalid, using auto config\n");
err = pnp_activate_dev(pdev);
if (err < 0) {
@@ -839,7 +839,7 @@ static void __devexit snd_opl3sa2_pnp_remove(struct pnp_dev * pdev)
}
static struct pnp_driver opl3sa2_pnp_driver = {
- .name = "opl3sa2",
+ .name = "opl3sa2-pnpbios",
.id_table = snd_opl3sa2_pnpbiosids,
.probe = snd_opl3sa2_pnp_detect,
.remove = __devexit_p(snd_opl3sa2_pnp_remove),