a few more -- unregister platform device again if probe was unsuccessful
PATCH 2/2 a few more -- unregister platform device again if probe was unsuccessful
Hi Takashi.
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.
sound/arm/sa11xx-uda1341.c | 14 +++++++++----- sound/drivers/dummy.c | 4 ++++ sound/drivers/mpu401/mpu401.c | 4 ++++ sound/drivers/mtpav.c | 14 +++++++++----- sound/drivers/serial-u16550.c | 4 ++++ sound/drivers/virmidi.c | 4 ++++ sound/ppc/powermac.c | 14 +++++++++-----
Signed-off-by Rene Herman <[email protected]>
sound/arm/sa11xx-uda1341.c +9 -5
@@ -984,11 +984,15 @@ static int __init sa11xx_uda1341_init(voif ((err =platform_driver_register (&sa11xx_uda1341_driver)) <0 )return err; device =platform_device_register_simple (SA11XX_UDA1341_DRIVER ,-1 ,NULL ,0 ); -if (IS_ERR (device)) { -platform_driver_unregister (&sa11xx_uda1341_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 (&sa11xx_uda1341_driver); +return err; } static void __exit sa11xx_uda1341_exit(void)
sound/drivers/dummy.c +4 -0
@@ -677,6 +677,10 @@ static int __init alsa_card_dummy_init(v i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/drivers/mpu401/mpu401.c +4 -0
@@ -254,6 +254,10 @@ static int __init alsa_card_mpu401_init( i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } platform_devices[i] = device; snd_mpu401_devices++; }
sound/drivers/mtpav.c +9 -5
@@ -770,11 +770,15 @@ static int __init alsa_card_mtpav_init(vreturn err; device =platform_device_register_simple (SND_MTPAV_DRIVER ,-1 ,NULL ,0 ); -if (IS_ERR (device)) { -platform_driver_unregister (&snd_mtpav_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_mtpav_driver); +return err; } static void __exit alsa_card_mtpav_exit(void)
sound/drivers/serial-u16550.c +4 -0
@@ -998,6 +998,10 @@ static int __init alsa_card_serial_init( i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/drivers/virmidi.c +4 -0
@@ -171,6 +171,10 @@ static int __init alsa_card_virmidi_init i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/ppc/powermac.c +9 -5
@@ -188,11 +188,15 @@ static int __init alsa_card_pmac_init(voif ((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; }