From b5cdedabd2687d8e586d1230df5087606b1bafb1 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 25 Jul 2006 16:14:16 +0200 Subject: [PATCH] --- yaml --- r: 33208 b: refs/heads/master c: 545b07d3620c9eac3349398b5303d20cab260ff6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/ppc/powermac.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 3b6e075818fd..7536cae6f937 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e8331ac6973435b1e7604c30f2ad394035b46e1 +refs/heads/master: 545b07d3620c9eac3349398b5303d20cab260ff6 diff --git a/trunk/sound/ppc/powermac.c b/trunk/sound/ppc/powermac.c index fa9a44ab487e..2264574fa06b 100644 --- a/trunk/sound/ppc/powermac.c +++ b/trunk/sound/ppc/powermac.c @@ -181,21 +181,14 @@ 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)) { - 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; + return 0; } static void __exit alsa_card_pmac_exit(void) { - platform_device_unregister(device); + if (!IS_ERR(device)) + platform_device_unregister(device); platform_driver_unregister(&snd_pmac_driver); }