leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ALSA] opl3sa2 - use different name for PnP BIOS driver

Browse Source 
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>
This commit is contained in:
Jaroslav Kysela 2005-08-15 13:08:04 +02:00
parent 3e6c6139f0
commit cff79742fc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/isa/opl3sa2.c
View File

@ -607,7 +607,7 @@ static int __init snd_opl3sa2_pnp(int dev, opl3sa2_t *chip,
if (irq[dev] != SNDRV_AUTO_IRQ) if (irq[dev] != SNDRV_AUTO_IRQ)
pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1); pnp_resource_change(&cfg->irq_resource[0], irq[dev], 1);
err = pnp_manual_config_dev(pdev, cfg, 0); 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"); snd_printk(KERN_ERR "PnP manual resources are invalid, using auto config\n");
err = pnp_activate_dev(pdev); err = pnp_activate_dev(pdev);
if (err < 0) { 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 = { static struct pnp_driver opl3sa2_pnp_driver = {
.name = "opl3sa2", .name = "opl3sa2-pnpbios",
.id_table = snd_opl3sa2_pnpbiosids, .id_table = snd_opl3sa2_pnpbiosids,
.probe = snd_opl3sa2_pnp_detect, .probe = snd_opl3sa2_pnp_detect,
.remove = __devexit_p(snd_opl3sa2_pnp_remove), .remove = __devexit_p(snd_opl3sa2_pnp_remove),