projects
/
powerpc.git
/ 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
[powerpc.git]
/
sound
/
isa
/
gus
/
gusmax.c
diff --git
a/sound/isa/gus/gusmax.c
b/sound/isa/gus/gusmax.c
index
cafb9b6
..
a733fab
100644
(file)
--- a/
sound/isa/gus/gusmax.c
+++ b/
sound/isa/gus/gusmax.c
@@
-390,10
+390,8
@@
static int __init alsa_card_gusmax_init(void)
continue;
device = platform_device_register_simple(GUSMAX_DRIVER,
i, NULL, 0);
continue;
device = platform_device_register_simple(GUSMAX_DRIVER,
i, NULL, 0);
- if (IS_ERR(device)) {
- err = PTR_ERR(device);
- goto errout;
- }
+ if (IS_ERR(device))
+ continue;
devices[i] = device;
cards++;
}
devices[i] = device;
cards++;
}
@@
-401,14
+399,10
@@
static int __init alsa_card_gusmax_init(void)
#ifdef MODULE
printk(KERN_ERR "GUS MAX soundcard not found or device busy\n");
#endif
#ifdef MODULE
printk(KERN_ERR "GUS MAX soundcard not found or device busy\n");
#endif
-
err = -ENODEV
;
-
goto errout
;
+
snd_gusmax_unregister_all()
;
+
return -ENODEV
;
}
return 0;
}
return 0;
-
- errout:
- snd_gusmax_unregister_all();
- return err;
}
static void __exit alsa_card_gusmax_exit(void)
}
static void __exit alsa_card_gusmax_exit(void)