diff options
| author | Rene Herman | 2006-04-11 14:09:37 +0200 |
|---|---|---|
| committer | Jaroslav Kysela | 2006-04-12 11:55:32 +0200 |
| commit | dcccdd938ef0c5d96145957217b814b14bd46cdc (patch) | |
| tree | 8522ad7957ee85a7f0ab53f776afee8a05795be7 /sound/isa/sscape.c | |
| parent | [ALSA] continue on IS_ERR from platform device registration (diff) | |
| download | kernel-qcow2-linux-dcccdd938ef0c5d96145957217b814b14bd46cdc.tar.gz kernel-qcow2-linux-dcccdd938ef0c5d96145957217b814b14bd46cdc.tar.xz kernel-qcow2-linux-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/sscape.c')
| -rw-r--r-- | sound/isa/sscape.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 532f6e0eff0b..d2a856f0fde2 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -1438,6 +1438,10 @@ static int __init sscape_manual_probe(void) i, NULL, 0); if (IS_ERR(device)) continue; + if (!platform_get_drvdata(device)) { + platform_device_unregister(device); + continue; + } platform_devices[i] = device; } return 0; |