diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 16:35:18 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 16:35:18 +0200 |
| commit | 94171db1d2f23c22b6050d210b72db3bb2f0b81e (patch) | |
| tree | 2318d487807e9f7393fcd46ef0090a27b4ad7981 /sound/isa/cmi8330.c | |
| parent | [JFFS2] Fix race in post-mount node checking (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| download | linux-94171db1d2f23c22b6050d210b72db3bb2f0b81e.tar.xz linux-94171db1d2f23c22b6050d210b72db3bb2f0b81e.zip | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'sound/isa/cmi8330.c')
| -rw-r--r-- | sound/isa/cmi8330.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index bc0f5ebf5d3c..3c1e9fd56fe0 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c @@ -699,9 +699,11 @@ 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; + if (!platform_get_drvdata(device)) { + platform_device_unregister(device); + continue; } platform_devices[i] = device; cards++; @@ -719,14 +721,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) |