git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ALSA] continue on IS_ERR from platform device registration
[safe/jmp/linux-2.6]
/
sound
/
isa
/
gus
/
interwave.c
diff --git
a/sound/isa/gus/interwave.c
b/sound/isa/gus/interwave.c
index
de71b7a
..
4be472e
100644
(file)
--- a/
sound/isa/gus/interwave.c
+++ b/
sound/isa/gus/interwave.c
@@
-947,10
+947,8
@@
static int __init alsa_card_interwave_init(void)
#endif
device = platform_device_register_simple(INTERWAVE_DRIVER,
i, NULL, 0);
#endif
device = platform_device_register_simple(INTERWAVE_DRIVER,
i, NULL, 0);
- if (IS_ERR(device)) {
- err = PTR_ERR(device);
- goto errout;
- }
+ if (IS_ERR(device))
+ continue;
platform_devices[i] = device;
cards++;
}
platform_devices[i] = device;
cards++;
}
@@
-966,14
+964,10
@@
static int __init alsa_card_interwave_init(void)
#ifdef MODULE
printk(KERN_ERR "InterWave soundcard not found or device busy\n");
#endif
#ifdef MODULE
printk(KERN_ERR "InterWave soundcard not found or device busy\n");
#endif
-
err = -ENODEV
;
-
goto errout
;
+
snd_interwave_unregister_all()
;
+
return -ENODEV
;
}
return 0;
}
return 0;
-
- errout:
- snd_interwave_unregister_all();
- return err;
}
static void __exit alsa_card_interwave_exit(void)
}
static void __exit alsa_card_interwave_exit(void)