diff options
| author | Rene Herman <rene.herman@keyaccess.nl> | 2006-04-13 12:58:06 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 21:32:42 +0200 |
| commit | 7152447df98b3981d621224be947a2c8d77aed06 (patch) | |
| tree | 33419b17c13ee13c757c2d2fff9a09d47cc01af6 /sound/ppc | |
| parent | 79ca4f3f625e14212310f953b096e2e45110ac6b (diff) | |
[ALSA] unregister platform device again if probe was unsuccessful
This second one unregisters the platform device again when the probe is
unsuccesful for sound/drivers, sound/arm/sa11xx-uda1341.c and
sound/ppc/powermac.c. 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/ppc')
| -rw-r--r-- | sound/ppc/powermac.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index f4902a219e5..875f1f7bdc5 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c @@ -188,11 +188,15 @@ static int __init alsa_card_pmac_init(void) if ((err = platform_driver_register(&snd_pmac_driver)) < 0) return err; device = platform_device_register_simple(SND_PMAC_DRIVER, -1, NULL, 0); - if (IS_ERR(device)) { - platform_driver_unregister(&snd_pmac_driver); - return PTR_ERR(device); - } - return 0; + if (!IS_ERR(device)) { + if (platform_get_drvdata(device)) + return 0; + platform_device_unregister(device); + err = -ENODEV; + } else + err = PTR_ERR(device); + platform_driver_unregister(&snd_pmac_driver); + return err; } |