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/sgalaxy.c | |
| parent | [ALSA] continue on IS_ERR from platform device registration (diff) | |
| download | linux-dev-dcccdd938ef0c5d96145957217b814b14bd46cdc.tar.xz linux-dev-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/sgalaxy.c')
| -rw-r--r-- | sound/isa/sgalaxy.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c index f01a80a97ab8..09c8e8c6b5e3 100644 --- a/sound/isa/sgalaxy.c +++ b/sound/isa/sgalaxy.c @@ -368,6 +368,10 @@ static int __init alsa_card_sgalaxy_init(void) i, NULL, 0); if (IS_ERR(device)) continue; + if (!platform_get_drvdata(device)) { + platform_device_unregister(device); + continue; + } devices[i] = device; cards++; } |