unregister platform device again if probe was unsuccessful
PATCH 3/3 unregister platform device again if probe was unsuccessful
Hi Takashi
Unregister the platform device again if the probe was unsuccessful for -stable. Against 2.6.16.2.
Could you relay this to -stable with your ack?
Rene.
sound/isa/ad1848/ad1848.c +4 -0
@@ -195,6 +195,10 @@ static int __init alsa_card_ad1848_init( i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/isa/cmi8330.c +4 -0
@@ -698,6 +698,10 @@ static int __init alsa_card_cmi8330_init i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } platform_devices[i] = device; cards++; }
sound/isa/cs423x/cs4231.c +4 -0
@@ -211,6 +211,10 @@ static int __init alsa_card_cs4231_init( i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/isa/cs423x/cs4236.c +4 -0
@@ -779,6 +779,10 @@ static int __init alsa_card_cs423x_init( i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } platform_devices[i] = device; cards++; }
sound/isa/es1688/es1688.c +4 -0
@@ -215,6 +215,10 @@ static int __init alsa_card_es1688_init( i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/isa/gus/gusclassic.c +4 -0
@@ -255,6 +255,10 @@ static int __init alsa_card_gusclassic_i i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/isa/gus/gusextreme.c +4 -0
@@ -365,6 +365,10 @@ static int __init alsa_card_gusextreme_i i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/isa/gus/gusmax.c +4 -0
@@ -392,6 +392,10 @@ static int __init alsa_card_gusmax_init( i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/isa/gus/interwave.c +4 -0
@@ -947,6 +947,10 @@ static int __init alsa_card_interwave_in i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } platform_devices[i] = device; cards++; }
sound/isa/opl3sa2.c +4 -0
@@ -961,6 +961,10 @@ static int __init alsa_card_opl3sa2_init i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } platform_devices[i] = device; cards++; }
sound/isa/sb/sb16.c +4 -0
@@ -720,6 +720,10 @@ static int __init alsa_card_sb16_init(vo i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } platform_devices[i] = device; cards++; }
sound/isa/sb/sb8.c +4 -0
@@ -266,6 +266,10 @@ static int __init alsa_card_sb8_init(voi i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/isa/sgalaxy.c +4 -0
@@ -368,6 +368,10 @@ static int __init alsa_card_sgalaxy_init i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } devices[i] = device; cards++; }
sound/isa/wavefront/wavefront.c +4 -0
@@ -722,6 +722,10 @@ static int __init alsa_card_wavefront_in i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } platform_devices[i] = device; cards++; }
sound/isa/es18xx.c +4 -0
@@ -2233,6 +2233,10 @@ static int __init alsa_card_es18xx_init( i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } platform_devices[i] = device; cards++; }
sound/isa/opti9xx/opti92x-ad1848.c +5 -2
@@ -2099,8 +2099,11 @@ static int __init alsa_card_opti9xx_initreturn error; device =platform_device_register_simple (DRIVER_NAME ,-1 ,NULL ,0 );if (!IS_ERR (device)) { - snd_opti9xx_platform_device = device; -return 0 ; +if (platform_get_drvdata (device)) { + snd_opti9xx_platform_device = device; +return 0 ; + } +platform_device_unregister (device); }platform_driver_unregister (&snd_opti9xx_driver); }
sound/isa/sscape.c +4 -0
@@ -1438,6 +1438,10 @@ static int __init sscape_manual_probe(vo i, NULL, 0);if (IS_ERR (device))continue ; +if (!platform_get_drvdata (device)) { +platform_device_unregister (device); +continue ; + } platform_devices[i] = device; }return 0 ;