aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/cs423x
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-02-20 05:57:34 -0500
committerJaroslav Kysela <perex@suse.cz>2006-03-22 04:30:43 -0500
commit8278ca8feb2748cf02d756ac6c5b9ab2e047c84a (patch)
treea58ddfa8d7ac897c02e4ba3bda9b77e278348fbf /sound/isa/cs423x
parent1a56f8d662ec7fc86f2c408d289fa07cdb781746 (diff)
[ALSA] Fix check of enable module option
Fix the check of enable module option in probe of platform_device drivers. It shouldn't break the loop but just ignore if enable[i] is false. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/cs423x')
-rw-r--r--sound/isa/cs423x/cs4231.c4
-rw-r--r--sound/isa/cs423x/cs4236.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index ab67b5c2590d..a30dcd962525 100644
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -203,8 +203,10 @@ static int __init alsa_card_cs4231_init(void)
203 return err; 203 return err;
204 204
205 cards = 0; 205 cards = 0;
206 for (i = 0; i < SNDRV_CARDS && enable[i]; i++) { 206 for (i = 0; i < SNDRV_CARDS; i++) {
207 struct platform_device *device; 207 struct platform_device *device;
208 if (! enable[i])
209 continue;
208 device = platform_device_register_simple(SND_CS4231_DRIVER, 210 device = platform_device_register_simple(SND_CS4231_DRIVER,
209 i, NULL, 0); 211 i, NULL, 0);
210 if (IS_ERR(device)) { 212 if (IS_ERR(device)) {
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 99a42138bea0..4060918e0327 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -771,9 +771,9 @@ static int __init alsa_card_cs423x_init(void)
771 if ((err = platform_driver_register(&cs423x_nonpnp_driver)) < 0) 771 if ((err = platform_driver_register(&cs423x_nonpnp_driver)) < 0)
772 return err; 772 return err;
773 773
774 for (i = 0; i < SNDRV_CARDS && enable[i]; i++) { 774 for (i = 0; i < SNDRV_CARDS; i++) {
775 struct platform_device *device; 775 struct platform_device *device;
776 if (is_isapnp_selected(i)) 776 if (! enable[i] || is_isapnp_selected(i))
777 continue; 777 continue;
778 device = platform_device_register_simple(CS423X_DRIVER, 778 device = platform_device_register_simple(CS423X_DRIVER,
779 i, NULL, 0); 779 i, NULL, 0);