diff options
| author | Rene Herman <rene.herman@keyaccess.nl> | 2006-04-13 12:57:11 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-04-27 21:10:08 +0200 |
| commit | a182ee9876c7826d0b8f7789cb5c38c5bfbec441 (patch) | |
| tree | 68862b25d3e70a8c294ec248d3473e30fb2aae94 /sound/drivers/virmidi.c | |
| parent | 5c59e09d7e51f5781439aa6f1963076568fd1f4f (diff) | |
| download | op-kernel-dev-a182ee9876c7826d0b8f7789cb5c38c5bfbec441.zip op-kernel-dev-a182ee9876c7826d0b8f7789cb5c38c5bfbec441.tar.gz | |
[ALSA] continue on IS_ERR from platform device registration
I previously only concerned myself with sound/isa. When I now checked
for more platform_device_register_simple() usages in ALSA I found a
couple more drivers that needed the same patches as already submitted
for all the ISA drivers.
This first one is the continue-on-iserr patch for sound/drivers. This
gets them all.
Signed-off-by: Rene Herman <rene.herman@keyaccess.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/virmidi.c')
| -rw-r--r-- | sound/drivers/virmidi.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c index a3ee306..26eb249 100644 --- a/sound/drivers/virmidi.c +++ b/sound/drivers/virmidi.c @@ -169,10 +169,8 @@ static int __init alsa_card_virmidi_init(void) continue; device = platform_device_register_simple(SND_VIRMIDI_DRIVER, i, NULL, 0); - if (IS_ERR(device)) { - err = PTR_ERR(device); - goto errout; - } + if (IS_ERR(device)) + continue; devices[i] = device; cards++; } @@ -180,14 +178,10 @@ static int __init alsa_card_virmidi_init(void) #ifdef MODULE printk(KERN_ERR "Card-VirMIDI soundcard not found or device busy\n"); #endif - err = -ENODEV; - goto errout; + snd_virmidi_unregister_all(); + return -ENODEV; } return 0; - - errout: - snd_virmidi_unregister_all(); - return err; } static void __exit alsa_card_virmidi_exit(void) |
