aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/serial-u16550.c
diff options
context:
space:
mode:
authorRene Herman <rene.herman@keyaccess.nl>2006-04-13 12:57:11 +0200
committerJaroslav Kysela <perex@suse.cz>2006-04-27 21:10:08 +0200
commita182ee9876c7826d0b8f7789cb5c38c5bfbec441 (patch)
tree68862b25d3e70a8c294ec248d3473e30fb2aae94 /sound/drivers/serial-u16550.c
parent5c59e09d7e51f5781439aa6f1963076568fd1f4f (diff)
downloadmrst-s0i3-test-a182ee9876c7826d0b8f7789cb5c38c5bfbec441.tar.gz
mrst-s0i3-test-a182ee9876c7826d0b8f7789cb5c38c5bfbec441.tar.xz
mrst-s0i3-test-a182ee9876c7826d0b8f7789cb5c38c5bfbec441.zip
[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/serial-u16550.c')
-rw-r--r--sound/drivers/serial-u16550.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 1a7fbefe474..c01b4c5118b 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -996,10 +996,8 @@ static int __init alsa_card_serial_init(void)
continue;
device = platform_device_register_simple(SND_SERIAL_DRIVER,
i, NULL, 0);
- if (IS_ERR(device)) {
- err = PTR_ERR(device);
- goto errout;
- }
+ if (IS_ERR(device))
+ continue;
devices[i] = device;
cards++;
}
@@ -1007,14 +1005,10 @@ static int __init alsa_card_serial_init(void)
#ifdef MODULE
printk(KERN_ERR "serial midi soundcard not found or device busy\n");
#endif
- err = -ENODEV;
- goto errout;
+ snd_serial_unregister_all();
+ return -ENODEV;
}
return 0;
-
- errout:
- snd_serial_unregister_all();
- return err;
}
static void __exit alsa_card_serial_exit(void)