Skip to content

Commit

Permalink
[ALSA] Fix check of enable module option
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Mar 22, 2006
1 parent 1a56f8d commit 8278ca8
Show file tree
Hide file tree
Showing 18 changed files with 51 additions and 21 deletions.
4 changes: 3 additions & 1 deletion sound/drivers/dummy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,8 +669,10 @@ static int __init alsa_card_dummy_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(SND_DUMMY_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 3 additions & 1 deletion sound/drivers/mpu401/mpu401.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,10 @@ static int __init alsa_card_mpu401_init(void)
return err;

devices = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
#ifdef CONFIG_PNP
if (pnp[i])
continue;
Expand Down
4 changes: 3 additions & 1 deletion sound/drivers/serial-u16550.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -989,8 +989,10 @@ static int __init alsa_card_serial_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(SND_SERIAL_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 3 additions & 1 deletion sound/drivers/virmidi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,10 @@ static int __init alsa_card_virmidi_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(SND_VIRMIDI_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/ad1848/ad1848.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,10 @@ static int __init alsa_card_ad1848_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(SND_AD1848_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/cs423x/cs4231.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,10 @@ static int __init alsa_card_cs4231_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(SND_CS4231_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 2 additions & 2 deletions sound/isa/cs423x/cs4236.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,9 +771,9 @@ static int __init alsa_card_cs423x_init(void)
if ((err = platform_driver_register(&cs423x_nonpnp_driver)) < 0)
return err;

for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (is_isapnp_selected(i))
if (! enable[i] || is_isapnp_selected(i))
continue;
device = platform_device_register_simple(CS423X_DRIVER,
i, NULL, 0);
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/es1688/es1688.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,10 @@ static int __init alsa_card_es1688_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(ES1688_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 2 additions & 2 deletions sound/isa/es18xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2381,9 +2381,9 @@ static int __init alsa_card_es18xx_init(void)
if ((err = platform_driver_register(&snd_es18xx_nonpnp_driver)) < 0)
return err;

for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (is_isapnp_selected(i))
if (! enable[i] || is_isapnp_selected(i))
continue;
device = platform_device_register_simple(ES18XX_DRIVER,
i, NULL, 0);
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/gus/gusclassic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,10 @@ static int __init alsa_card_gusclassic_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(GUSCLASSIC_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/gus/gusextreme.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,10 @@ static int __init alsa_card_gusextreme_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(GUSEXTREME_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/gus/gusmax.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,10 @@ static int __init alsa_card_gusmax_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(GUSMAX_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/gus/interwave.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -935,8 +935,10 @@ static int __init alsa_card_interwave_init(void)
if ((err = platform_driver_register(&snd_interwave_driver)) < 0)
return err;

for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
#ifdef CONFIG_PNP
if (isapnp[i])
continue;
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/opl3sa2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -949,8 +949,10 @@ static int __init alsa_card_opl3sa2_init(void)
if ((err = platform_driver_register(&snd_opl3sa2_nonpnp_driver)) < 0)
return err;

for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
#ifdef CONFIG_PNP
if (isapnp[i])
continue;
Expand Down
4 changes: 2 additions & 2 deletions sound/isa/sb/sb16.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,9 +712,9 @@ static int __init alsa_card_sb16_init(void)
if ((err = platform_driver_register(&snd_sb16_nonpnp_driver)) < 0)
return err;

for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (is_isapnp_selected(i))
if (! enable[i] || is_isapnp_selected(i))
continue;
device = platform_device_register_simple(SND_SB16_DRIVER,
i, NULL, 0);
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/sb/sb8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,10 @@ static int __init alsa_card_sb8_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(SND_SB8_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/sgalaxy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,10 @@ static int __init alsa_card_sgalaxy_init(void)
return err;

cards = 0;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
device = platform_device_register_simple(SND_SGALAXY_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
Expand Down
4 changes: 3 additions & 1 deletion sound/isa/wavefront/wavefront.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,8 +710,10 @@ static int __init alsa_card_wavefront_init(void)
if ((err = platform_driver_register(&snd_wavefront_driver)) < 0)
return err;

for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
if (! enable[i])
continue;
#ifdef CONFIG_PNP
if (isapnp[i])
continue;
Expand Down

0 comments on commit 8278ca8

Please sign in to comment.