diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /sound/isa/cs423x/cs4236.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'sound/isa/cs423x/cs4236.c')
| -rw-r--r-- | sound/isa/cs423x/cs4236.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |