aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 60c120ffb9de..049d479ce2b3 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -1927,10 +1927,12 @@ static struct snd_card *snd_opti9xx_card_new(void)
1927static int __devinit snd_opti9xx_isa_match(struct device *devptr, 1927static int __devinit snd_opti9xx_isa_match(struct device *devptr,
1928 unsigned int dev) 1928 unsigned int dev)
1929{ 1929{
1930#ifdef CONFIG_PNP
1930 if (snd_opti9xx_pnp_is_probed) 1931 if (snd_opti9xx_pnp_is_probed)
1931 return 0; 1932 return 0;
1932 if (isapnp) 1933 if (isapnp)
1933 return 0; 1934 return 0;
1935#endif
1934 return 1; 1936 return 1;
1935} 1937}
1936 1938
@@ -2096,6 +2098,7 @@ static int __init alsa_card_opti9xx_init(void)
2096 pnp_register_card_driver(&opti9xx_pnpc_driver); 2098 pnp_register_card_driver(&opti9xx_pnpc_driver);
2097 if (snd_opti9xx_pnp_is_probed) 2099 if (snd_opti9xx_pnp_is_probed)
2098 return 0; 2100 return 0;
2101 pnp_unregister_card_driver(&opti9xx_pnpc_driver);
2099#endif 2102#endif
2100 return isa_register_driver(&snd_opti9xx_driver, 1); 2103 return isa_register_driver(&snd_opti9xx_driver, 1);
2101} 2104}