summaryrefslogtreecommitdiff
path: root/sound/isa/cs423x/cs4231.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-23 00:13:54 (GMT)
committerJeff Garzik <jeff@garzik.org>2006-03-23 00:13:54 (GMT)
commitf01c18456993bab43067b678f56c87ca954aa43b (patch)
tree3e0cd0cdf1a57618202b46a7126125902e3ab832 /sound/isa/cs423x/cs4231.c
parent949ec2c8e6b7b89179b85baf6309c009e1a1b951 (diff)
parent1c2e02750b992703a8a18634e08b04353face243 (diff)
downloadlinux-f01c18456993bab43067b678f56c87ca954aa43b.tar.xz
Merge branch 'master'
Diffstat (limited to 'sound/isa/cs423x/cs4231.c')
-rw-r--r--sound/isa/cs423x/cs4231.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index ab67b5c..a30dcd9 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)
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)) {