View | Details | Raw Unified | Return to bug 5568 | Differences between
and this patch

Collapse All | Expand All

(-)linux/sound/isa/opl3sa2.c (-2 / +7 lines)
Lines 890-895 Link Here
890
static int __init alsa_card_opl3sa2_init(void)
890
static int __init alsa_card_opl3sa2_init(void)
891
{
891
{
892
	int dev, cards = 0;
892
	int dev, cards = 0;
893
	int err;
893
894
894
	for (dev = 0; dev < SNDRV_CARDS; dev++) {
895
	for (dev = 0; dev < SNDRV_CARDS; dev++) {
895
		if (!enable[dev])
896
		if (!enable[dev])
Lines 902-909 Link Here
902
			cards++;
903
			cards++;
903
	}
904
	}
904
#ifdef CONFIG_PNP
905
#ifdef CONFIG_PNP
905
	cards += pnp_register_driver(&opl3sa2_pnp_driver);
906
	err = pnp_register_driver(&opl3sa2_pnp_driver);
906
	cards += pnp_register_card_driver(&opl3sa2_pnpc_driver);
907
	if (err > 0)
908
		cards += err;
909
	err = pnp_register_card_driver(&opl3sa2_pnpc_driver);
910
	if (err > 0)
911
		cards += err;
907
#endif
912
#endif
908
	if (!cards) {
913
	if (!cards) {
909
#ifdef MODULE
914
#ifdef MODULE

Return to bug 5568