Skip to content

Commit

Permalink
[ALSA] opti9x - Fix compile without CONFIG_PNP
Browse files Browse the repository at this point in the history
Modules: Opti9xx drivers

Fix compile errors without CONFIG_PNP.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Mar 22, 2006
1 parent a5a6bbd commit 0bbbc4c
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions sound/isa/opti9xx/opti92x-ad1848.c
Original file line number Diff line number Diff line change
Expand Up @@ -2088,9 +2088,11 @@ static int __init alsa_card_opti9xx_init(void)
int error;
struct platform_device *device;

#ifdef CONFIG_PNP
pnp_register_card_driver(&opti9xx_pnpc_driver);
if (snd_opti9xx_pnp_is_probed)
return 0;
#endif
if (! is_isapnp_selected()) {
error = platform_driver_register(&snd_opti9xx_driver);
if (error < 0)
Expand All @@ -2102,7 +2104,9 @@ static int __init alsa_card_opti9xx_init(void)
}
platform_driver_unregister(&snd_opti9xx_driver);
}
#ifdef CONFIG_PNP
pnp_unregister_card_driver(&opti9xx_pnpc_driver);
#endif
#ifdef MODULE
printk(KERN_ERR "no OPTi " CHIP_NAME " soundcard found\n");
#endif
Expand All @@ -2115,7 +2119,9 @@ static void __exit alsa_card_opti9xx_exit(void)
platform_device_unregister(snd_opti9xx_platform_device);
platform_driver_unregister(&snd_opti9xx_driver);
}
#ifdef CONFIG_PNP
pnp_unregister_card_driver(&opti9xx_pnpc_driver);
#endif
}

module_init(alsa_card_opti9xx_init)
Expand Down

0 comments on commit 0bbbc4c

Please sign in to comment.