aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/mtpav.c
diff options
context:
space:
mode:
authorRene Herman <rene.herman@keyaccess.nl>2006-04-13 06:58:06 -0400
committerJaroslav Kysela <perex@suse.cz>2006-06-22 15:32:42 -0400
commit7152447df98b3981d621224be947a2c8d77aed06 (patch)
tree33419b17c13ee13c757c2d2fff9a09d47cc01af6 /sound/drivers/mtpav.c
parent79ca4f3f625e14212310f953b096e2e45110ac6b (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/drivers/mtpav.c')
-rw-r--r--sound/drivers/mtpav.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index b7a0b42813e1..474eed06e70f 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -770,11 +770,15 @@ static int __init alsa_card_mtpav_init(void)
770 return err; 770 return err;
771 771
772 device = platform_device_register_simple(SND_MTPAV_DRIVER, -1, NULL, 0); 772 device = platform_device_register_simple(SND_MTPAV_DRIVER, -1, NULL, 0);
773 if (IS_ERR(device)) { 773 if (!IS_ERR(device)) {
774 platform_driver_unregister(&snd_mtpav_driver); 774 if (platform_get_drvdata(device))
775 return PTR_ERR(device); 775 return 0;
776 } 776 platform_device_unregister(device);
777 return 0; 777 err = -ENODEV;
778 } else
779 err = PTR_ERR(device);
780 platform_driver_unregister(&snd_mtpav_driver);
781 return err;
778} 782}
779 783
780static void __exit alsa_card_mtpav_exit(void) 784static void __exit alsa_card_mtpav_exit(void)