2 files changed, 5 insertions, 3 deletions

diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 0667bd14ad60..5737ab76160c 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -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);
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index 60ee79cd14a3..3efa23d303c3 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -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)) {