diff options
| author | Rene Herman <rene.herman@keyaccess.nl> | 2006-04-11 14:09:37 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-04-12 11:55:32 +0200 |
| commit | dcccdd938ef0c5d96145957217b814b14bd46cdc (patch) | |
| tree | 8522ad7957ee85a7f0ab53f776afee8a05795be7 /sound/isa/gus | |
| parent | d0ac642d76c79c5cc673c4cdfe43e926379784e1 (diff) | |
| download | kernel_samsung_smdk4412-dcccdd938ef0c5d96145957217b814b14bd46cdc.tar.gz kernel_samsung_smdk4412-dcccdd938ef0c5d96145957217b814b14bd46cdc.tar.bz2 kernel_samsung_smdk4412-dcccdd938ef0c5d96145957217b814b14bd46cdc.zip | |
[ALSA] unregister platform device again if probe was unsuccessful
Unregister the platform device again if the probe was unsuccessful.
This restores the behaviour of not loading the driver on probe() failure.
Signed-off-by: Rene Herman <rene.herman@keyaccess.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/gus')
| -rw-r--r-- | sound/isa/gus/gusclassic.c | 4 | ||||
| -rw-r--r-- | sound/isa/gus/gusextreme.c | 4 | ||||
| -rw-r--r-- | sound/isa/gus/gusmax.c | 4 | ||||
| -rw-r--r-- | sound/isa/gus/interwave.c | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c index ed34427c49d..37057a37dc3 100644 --- a/sound/isa/gus/gusclassic.c +++ b/sound/isa/gus/gusclassic.c @@ -255,6 +255,10 @@ static int __init alsa_card_gusclassic_init(void) i, NULL, 0); if (IS_ERR(device)) continue; + if (!platform_get_drvdata(device)) { + platform_device_unregister(device); + continue; + } devices[i] = device; cards++; } diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c index aa312dee99c..05852fcc613 100644 --- a/sound/isa/gus/gusextreme.c +++ b/sound/isa/gus/gusextreme.c @@ -365,6 +365,10 @@ static int __init alsa_card_gusextreme_init(void) i, NULL, 0); if (IS_ERR(device)) continue; + if (!platform_get_drvdata(device)) { + platform_device_unregister(device); + continue; + } devices[i] = device; cards++; } diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c index a733fabf653..fcf2c8fe6f9 100644 --- a/sound/isa/gus/gusmax.c +++ b/sound/isa/gus/gusmax.c @@ -392,6 +392,10 @@ static int __init alsa_card_gusmax_init(void) i, NULL, 0); if (IS_ERR(device)) continue; + if (!platform_get_drvdata(device)) { + platform_device_unregister(device); + continue; + } devices[i] = device; cards++; } diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index 4be472ea99d..4298d339e78 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c @@ -949,6 +949,10 @@ static int __init alsa_card_interwave_init(void) i, NULL, 0); if (IS_ERR(device)) continue; + if (!platform_get_drvdata(device)) { + platform_device_unregister(device); + continue; + } platform_devices[i] = device; cards++; } |