lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] continue on IS_ERR from platform device registration

Browse Source 
Continue with the next one on error from device registration.

This would seem the correct thing to do, even if it's not the probe()
error that we're getting.

Signed-off-by: Rene Herman <rene.herman@keyaccess.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Rene Herman
2006-04-11 14:08:33 +02:00
committed by Jaroslav Kysela
parent 12831c15f3
commit d0ac642d76
16 changed files with 64 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound/isa/opl3sa2.c
View File

@ -962,10 +962,8 @@ static int __init alsa_card_opl3sa2_init(void)
#endif
device = platform_device_register_simple(OPL3SA2_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
err = PTR_ERR(device);
goto errout;
}
if (IS_ERR(device))
continue;
platform_devices[i] = device;
snd_opl3sa2_devices++;
}
@ -983,14 +981,10 @@ static int __init alsa_card_opl3sa2_init(void)
#ifdef MODULE
snd_printk(KERN_ERR "Yamaha OPL3-SA soundcard not found or device busy\n");
#endif
err = -ENODEV;
goto errout;
snd_opl3sa2_unregister_all();
return -ENODEV;
}
return 0;
errout:
snd_opl3sa2_unregister_all();
return err;
}
static void __exit alsa_card_opl3sa2_exit(void)