Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 609d7694 authored by Rene Herman's avatar Rene Herman Committed by Jaroslav Kysela
Browse files

[ALSA] Fix probe of non-PnP ISA devices 



isa_register_driver() returns an error if no device is found
and it's no fatal error for the drivers with pnp support.

Signed-off-by: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 60af15f5

sound/isa/cmi8330.c

+11 −4
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ module_param_array(wssdma, int, NULL, 0444); 
MODULE_PARM_DESC(wssdma, "DMA for CMI8330 WSS driver.");



#ifdef CONFIG_PNP

static int isa_registered;

static int pnp_registered;

#endif
@@ -686,14 +687,18 @@ static int __init alsa_card_cmi8330_init(void) 
	int err;



	err = isa_register_driver(&snd_cmi8330_driver, SNDRV_CARDS);

	if (err < 0)

		return err;

#ifdef CONFIG_PNP

	if (!err)

		isa_registered = 1;



	err = pnp_register_card_driver(&cmi8330_pnpc_driver);

	if (!err)

		pnp_registered = 1;



	if (isa_registered)

		err = 0;

#endif

	return 0;

	return err;

}



static void __exit alsa_card_cmi8330_exit(void)
@@ -701,6 +706,8 @@ static void __exit alsa_card_cmi8330_exit(void) 
#ifdef CONFIG_PNP

	if (pnp_registered)

		pnp_unregister_card_driver(&cmi8330_pnpc_driver);



	if (isa_registered)

#endif

		isa_unregister_driver(&snd_cmi8330_driver);

}

sound/isa/cs423x/cs4236.c

+14 −6
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ module_param_array(dma2, int, NULL, 0444); 
MODULE_PARM_DESC(dma2, "DMA2 # for " IDENT " driver.");



#ifdef CONFIG_PNP

static int isa_registered;

static int pnpc_registered;

#ifdef CS4232

static int pnp_registered;
@@ -770,9 +771,9 @@ static int __init alsa_card_cs423x_init(void) 
	int err;



	err = isa_register_driver(&cs423x_isa_driver, SNDRV_CARDS);

	if (err < 0)

		return err;

#ifdef CONFIG_PNP

	if (!err)

		isa_registered = 1;

#ifdef CS4232

	err = pnp_register_driver(&cs4232_pnp_driver);

	if (!err)
@@ -781,8 +782,14 @@ static int __init alsa_card_cs423x_init(void) 
	err = pnp_register_card_driver(&cs423x_pnpc_driver);

	if (!err)

		pnpc_registered = 1;

#endif /* CONFIG_PNP */

	return 0;

#ifdef CS4232

	if (pnp_registered)

		err = 0;

#endif

	if (isa_registered)

		err = 0;

#endif

	return err;

}



static void __exit alsa_card_cs423x_exit(void)
@@ -794,7 +801,8 @@ static void __exit alsa_card_cs423x_exit(void) 
	if (pnp_registered)

		pnp_unregister_driver(&cs4232_pnp_driver);

#endif

#endif /* CONFIG_PNP */

	if (isa_registered)

#endif

		isa_unregister_driver(&cs423x_isa_driver);

}

sound/isa/es18xx.c

+13 −6
Original line number Diff line number Diff line
@@ -2036,7 +2036,9 @@ module_param_array(dma2, int, NULL, 0444); 
MODULE_PARM_DESC(dma2, "DMA 2 # for ES18xx driver.");



#ifdef CONFIG_PNP

static int pnp_registered, pnpc_registered;

static int isa_registered;

static int pnp_registered;

static int pnpc_registered;



static struct pnp_device_id snd_audiodrive_pnpbiosids[] = {

	{ .id = "ESS1869" },
@@ -2466,18 +2468,22 @@ static int __init alsa_card_es18xx_init(void) 
	int err;



	err = isa_register_driver(&snd_es18xx_isa_driver, SNDRV_CARDS);

	if (err < 0)

		return err;



#ifdef CONFIG_PNP

	if (!err)

		isa_registered = 1;



	err = pnp_register_driver(&es18xx_pnp_driver);

	if (!err)

		pnp_registered = 1;



	err = pnp_register_card_driver(&es18xx_pnpc_driver);

	if (!err)

		pnpc_registered = 1;



	if (isa_registered || pnp_registered)

		err = 0;

#endif

	return 0;

	return err;

}



static void __exit alsa_card_es18xx_exit(void)
@@ -2487,6 +2493,7 @@ static void __exit alsa_card_es18xx_exit(void) 
		pnp_unregister_card_driver(&es18xx_pnpc_driver);

	if (pnp_registered)

		pnp_unregister_driver(&es18xx_pnp_driver);

	if (isa_registered)

#endif

		isa_unregister_driver(&snd_es18xx_isa_driver);

}

sound/isa/gus/interwave.c

+10 −5
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ struct snd_interwave { 




#ifdef CONFIG_PNP

static int isa_registered;

static int pnp_registered;



static struct pnp_card_device_id snd_interwave_pnpids[] = {
@@ -934,15 +935,18 @@ static int __init alsa_card_interwave_init(void) 
	int err;



	err = isa_register_driver(&snd_interwave_driver, SNDRV_CARDS);

	if (err < 0)

		return err;

#ifdef CONFIG_PNP

	/* ISA PnP cards */

	if (!err)

		isa_registered = 1;



	err = pnp_register_card_driver(&interwave_pnpc_driver);

	if (!err)

		pnp_registered = 1;



	if (isa_registered)

		err = 0;

#endif

	return 0;

	return err;

}



static void __exit alsa_card_interwave_exit(void)
@@ -950,6 +954,7 @@ static void __exit alsa_card_interwave_exit(void) 
#ifdef CONFIG_PNP

	if (pnp_registered)

		pnp_unregister_card_driver(&interwave_pnpc_driver);

	if (isa_registered)

#endif

		isa_unregister_driver(&snd_interwave_driver);

}

sound/isa/opl3sa2.c

+11 −4
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ module_param_array(opl3sa3_ymode, int, NULL, 0444); 
MODULE_PARM_DESC(opl3sa3_ymode, "Speaker size selection for 3D Enhancement mode: Desktop/Large Notebook/Small Notebook/HiFi.");



#ifdef CONFIG_PNP

static int isa_registered;

static int pnp_registered;

static int pnpc_registered;

#endif
@@ -967,17 +968,22 @@ static int __init alsa_card_opl3sa2_init(void) 
	int err;



	err = isa_register_driver(&snd_opl3sa2_isa_driver, SNDRV_CARDS);

	if (err < 0)

		return err;

#ifdef CONFIG_PNP

	if (!err)

		isa_registered = 1;



	err = pnp_register_driver(&opl3sa2_pnp_driver);

	if (!err)

		pnp_registered = 1;



	err = pnp_register_card_driver(&opl3sa2_pnpc_driver);

	if (!err)

		pnpc_registered = 1;



	if (isa_registered || pnp_registered)

		err = 0;

#endif

	return 0;

	return err;

}



static void __exit alsa_card_opl3sa2_exit(void)
@@ -987,6 +993,7 @@ static void __exit alsa_card_opl3sa2_exit(void) 
		pnp_unregister_card_driver(&opl3sa2_pnpc_driver);

	if (pnp_registered)

		pnp_unregister_driver(&opl3sa2_pnp_driver);

	if (isa_registered)

#endif

		isa_unregister_driver(&snd_opl3sa2_isa_driver);

}