diff options
| author | Rene Herman <rene.herman@keyaccess.nl> | 2006-04-11 14:08:33 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-04-12 11:55:30 +0200 |
| commit | d0ac642d76c79c5cc673c4cdfe43e926379784e1 (patch) | |
| tree | 676e529b860634706ff98978d0328a71e584bc4f /sound/isa/cmi8330.c | |
| parent | 12831c15f35dcc9f55fa63d50fd4892c7c6a0a1c (diff) | |
[ALSA] continue on IS_ERR from platform device registration
Continue with the next one on error from device registration.
This would seem the correct thing to do, even if it's not the probe()
error that we're getting.
Signed-off-by: Rene Herman <rene.herman@keyaccess.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/cmi8330.c')
| -rw-r--r-- | sound/isa/cmi8330.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index bc0f5ebf5d3..35780b811d1 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c @@ -699,10 +699,8 @@ static int __init alsa_card_cmi8330_init(void) continue; device = platform_device_register_simple(CMI8330_DRIVER, i, NULL, 0); - if (IS_ERR(device)) { - err = PTR_ERR(device); - goto errout; - } + if (IS_ERR(device)) + continue; platform_devices[i] = device; cards++; } @@ -719,14 +717,10 @@ static int __init alsa_card_cmi8330_init(void) #ifdef MODULE snd_printk(KERN_ERR "CMI8330 not found or device busy\n"); #endif - err = -ENODEV; - goto errout; + snd_cmi8330_unregister_all(); + return -ENODEV; } return 0; - - errout: - snd_cmi8330_unregister_all(); - return err; } static void __exit alsa_card_cmi8330_exit(void) |