a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ALSA] unregister platform device again if probe was unsuccessful

Browse Source 
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>
This commit is contained in:
Rene Herman 2006-04-13 12:58:06 +02:00 committed by Jaroslav Kysela
parent 79ca4f3f62
commit 7152447df9
7 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/arm/sa11xx-uda1341.c
View File

@ -984,11 +984,15 @@ static int __init sa11xx_uda1341_init(void)
if ((err = platform_driver_register(&sa11xx_uda1341_driver)) < 0) if ((err = platform_driver_register(&sa11xx_uda1341_driver)) < 0)
return err; return err;
device = platform_device_register_simple(SA11XX_UDA1341_DRIVER, -1, NULL, 0); device = platform_device_register_simple(SA11XX_UDA1341_DRIVER, -1, NULL, 0);
if (IS_ERR(device)) { if (!IS_ERR(device)) {
platform_driver_unregister(&sa11xx_uda1341_driver); if (platform_get_drvdata(device))
return PTR_ERR(device); return 0;
} platform_device_unregister(device);
return 0; err = -ENODEV
} else
err = PTR_ERR(device);
platform_driver_unregister(&sa11xx_uda1341_driver);
return err;
} }
static void __exit sa11xx_uda1341_exit(void) static void __exit sa11xx_uda1341_exit(void)

4
sound/drivers/dummy.c
View File

@ -677,6 +677,10 @@ static int __init alsa_card_dummy_init(void)
i, NULL, 0); i, NULL, 0);
if (IS_ERR(device)) if (IS_ERR(device))
continue; continue;
if (!platform_get_drvdata(device)) {
platform_device_unregister(device);
continue;
}
devices[i] = device; devices[i] = device;
cards++; cards++;
} }

4
sound/drivers/mpu401/mpu401.c
View File

@ -253,6 +253,10 @@ static int __init alsa_card_mpu401_init(void)
i, NULL, 0); i, NULL, 0);
if (IS_ERR(device)) if (IS_ERR(device))
continue; continue;
if (!platform_get_drvdata(device)) {
platform_device_unregister(device);
continue;
}
platform_devices[i] = device; platform_devices[i] = device;
snd_mpu401_devices++; snd_mpu401_devices++;
} }

14
sound/drivers/mtpav.c
View File

@ -770,11 +770,15 @@ static int __init alsa_card_mtpav_init(void)
return err; return err;
device = platform_device_register_simple(SND_MTPAV_DRIVER, -1, NULL, 0); device = platform_device_register_simple(SND_MTPAV_DRIVER, -1, NULL, 0);
if (IS_ERR(device)) { if (!IS_ERR(device)) {
platform_driver_unregister(&snd_mtpav_driver); if (platform_get_drvdata(device))
return PTR_ERR(device); return 0;
} platform_device_unregister(device);
return 0; err = -ENODEV;
} else
err = PTR_ERR(device);
platform_driver_unregister(&snd_mtpav_driver);
return err;
} }
static void __exit alsa_card_mtpav_exit(void) static void __exit alsa_card_mtpav_exit(void)

4
sound/drivers/serial-u16550.c
View File

@ -998,6 +998,10 @@ static int __init alsa_card_serial_init(void)
i, NULL, 0); i, NULL, 0);
if (IS_ERR(device)) if (IS_ERR(device))
continue; continue;
if (!platform_get_drvdata(device)) {
platform_device_unregister(device);
continue;
}
devices[i] = device; devices[i] = device;
cards++; cards++;
} }

4
sound/drivers/virmidi.c
View File

@ -171,6 +171,10 @@ static int __init alsa_card_virmidi_init(void)
i, NULL, 0); i, NULL, 0);
if (IS_ERR(device)) if (IS_ERR(device))
continue; continue;
if (!platform_get_drvdata(device)) {
platform_device_unregister(device);
continue;
}
devices[i] = device; devices[i] = device;
cards++; cards++;
} }

14
sound/ppc/powermac.c
View File

@ -188,11 +188,15 @@ static int __init alsa_card_pmac_init(void)
if ((err = platform_driver_register(&snd_pmac_driver)) < 0) if ((err = platform_driver_register(&snd_pmac_driver)) < 0)
return err; return err;
device = platform_device_register_simple(SND_PMAC_DRIVER, -1, NULL, 0); device = platform_device_register_simple(SND_PMAC_DRIVER, -1, NULL, 0);
if (IS_ERR(device)) { if (!IS_ERR(device)) {
platform_driver_unregister(&snd_pmac_driver); if (platform_get_drvdata(device))
return PTR_ERR(device); return 0;
} platform_device_unregister(device);
return 0; err = -ENODEV;
} else
err = PTR_ERR(device);
platform_driver_unregister(&snd_pmac_driver);
return err;
} }