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/ad1848 | |
| parent | [ALSA] sound/core/pcm.c: make snd_pcm_format_name() static (diff) | |
| download | linux-dev-d0ac642d76c79c5cc673c4cdfe43e926379784e1.tar.xz linux-dev-d0ac642d76c79c5cc673c4cdfe43e926379784e1.zip | |
[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/ad1848')
| -rw-r--r-- | sound/isa/ad1848/ad1848.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c index 326a057f752f..1f460eb402a3 100644 --- a/sound/isa/ad1848/ad1848.c +++ b/sound/isa/ad1848/ad1848.c @@ -193,10 +193,8 @@ static int __init alsa_card_ad1848_init(void) continue; device = platform_device_register_simple(SND_AD1848_DRIVER, i, NULL, 0); - if (IS_ERR(device)) { - err = PTR_ERR(device); - goto errout; - } + if (IS_ERR(device)) + continue; devices[i] = device; cards++; } @@ -204,14 +202,10 @@ static int __init alsa_card_ad1848_init(void) #ifdef MODULE printk(KERN_ERR "AD1848 soundcard not found or device busy\n"); #endif - err = -ENODEV; - goto errout; + snd_ad1848_unregister_all(); + return -ENODEV; } return 0; - - errout: - snd_ad1848_unregister_all(); - return err; } static void __exit alsa_card_ad1848_exit(void) |