aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/sb
diff options
context:
space:
mode:
authorRene Herman <rene.herman@keyaccess.nl>2006-04-11 08:09:37 -0400
committerJaroslav Kysela <perex@suse.cz>2006-04-12 05:55:32 -0400
commitdcccdd938ef0c5d96145957217b814b14bd46cdc (patch)
tree8522ad7957ee85a7f0ab53f776afee8a05795be7 /sound/isa/sb
parentd0ac642d76c79c5cc673c4cdfe43e926379784e1 (diff)
[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/sb')
-rw-r--r--sound/isa/sb/sb16.c4
-rw-r--r--sound/isa/sb/sb8.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 24fa190f33ac..6333f900eaee 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -722,6 +722,10 @@ static int __init alsa_card_sb16_init(void)
722 i, NULL, 0); 722 i, NULL, 0);
723 if (IS_ERR(device)) 723 if (IS_ERR(device))
724 continue; 724 continue;
725 if (!platform_get_drvdata(device)) {
726 platform_device_unregister(device);
727 continue;
728 }
725 platform_devices[i] = device; 729 platform_devices[i] = device;
726 cards++; 730 cards++;
727 } 731 }
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index f75eeb05c1fa..141400c01426 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -266,6 +266,10 @@ static int __init alsa_card_sb8_init(void)
266 i, NULL, 0); 266 i, NULL, 0);
267 if (IS_ERR(device)) 267 if (IS_ERR(device))
268 continue; 268 continue;
269 if (!platform_get_drvdata(device)) {
270 platform_device_unregister(device);
271 continue;
272 }
269 devices[i] = device; 273 devices[i] = device;
270 cards++; 274 cards++;
271 } 275 }