diff options
Diffstat (limited to 'sound/isa/sb/sb8.c')
-rw-r--r-- | sound/isa/sb/sb8.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c index 3efa23d303c3..f75eeb05c1fa 100644 --- a/sound/isa/sb/sb8.c +++ b/sound/isa/sb/sb8.c | |||
@@ -264,10 +264,8 @@ static int __init alsa_card_sb8_init(void) | |||
264 | continue; | 264 | continue; |
265 | device = platform_device_register_simple(SND_SB8_DRIVER, | 265 | device = platform_device_register_simple(SND_SB8_DRIVER, |
266 | i, NULL, 0); | 266 | i, NULL, 0); |
267 | if (IS_ERR(device)) { | 267 | if (IS_ERR(device)) |
268 | err = PTR_ERR(device); | 268 | continue; |
269 | goto errout; | ||
270 | } | ||
271 | devices[i] = device; | 269 | devices[i] = device; |
272 | cards++; | 270 | cards++; |
273 | } | 271 | } |
@@ -275,14 +273,10 @@ static int __init alsa_card_sb8_init(void) | |||
275 | #ifdef MODULE | 273 | #ifdef MODULE |
276 | snd_printk(KERN_ERR "Sound Blaster soundcard not found or device busy\n"); | 274 | snd_printk(KERN_ERR "Sound Blaster soundcard not found or device busy\n"); |
277 | #endif | 275 | #endif |
278 | err = -ENODEV; | 276 | snd_sb8_unregister_all(); |
279 | goto errout; | 277 | return -ENODEV; |
280 | } | 278 | } |
281 | return 0; | 279 | return 0; |
282 | |||
283 | errout: | ||
284 | snd_sb8_unregister_all(); | ||
285 | return err; | ||
286 | } | 280 | } |
287 | 281 | ||
288 | static void __exit alsa_card_sb8_exit(void) | 282 | static void __exit alsa_card_sb8_exit(void) |