Merge branch 'linus'

1 files changed, 3 insertions, 1 deletions

diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index fa3ab960de17..c0115bf9065e 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -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;