From: Rene Herman <rene.herman@keyaccess.nl>
To: Takashi Iwai <tiwai@suse.de>
Cc: ALSA devel <alsa-devel@alsa-project.org>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: [ALSA STABLE 2/3] a few more -- continue on IS_ERR from platform device registration
Date: Thu, 13 Apr 2006 03:45:03 +0200 [thread overview]
Message-ID: <443DAD1F.3070802@keyaccess.nl> (raw)
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
Hi Takashi.
And continue-on-iserr for sound/drivers...
sound/drivers/dummy.c | 14 ++++----------
sound/drivers/mpu401/mpu401.c | 14 ++++----------
sound/drivers/serial-u16550.c | 14 ++++----------
sound/drivers/virmidi.c | 14 ++++----------
4 files changed, 16 insertions(+), 40 deletions(-)
Signed-off-by: Rene Herman <rene.herman@keyaccess.nl>
[-- Attachment #2: alsa_platform_iserr_remainder.diff --]
[-- Type: text/plain, Size: 3750 bytes --]
Index: local/sound/drivers/mpu401/mpu401.c
===================================================================
--- local.orig/sound/drivers/mpu401/mpu401.c 2006-04-13 03:03:18.000000000 +0200
+++ local/sound/drivers/mpu401/mpu401.c 2006-04-13 03:11:35.000000000 +0200
@@ -250,10 +250,8 @@ static int __init alsa_card_mpu401_init(
#endif
device = platform_device_register_simple(SND_MPU401_DRIVER,
i, NULL, 0);
- if (IS_ERR(device)) {
- err = PTR_ERR(device);
- goto errout;
- }
+ if (IS_ERR(device))
+ continue;
platform_devices[i] = device;
devices++;
}
@@ -266,14 +264,10 @@ static int __init alsa_card_mpu401_init(
#ifdef MODULE
printk(KERN_ERR "MPU-401 device not found or device busy\n");
#endif
- err = -ENODEV;
- goto errout;
+ snd_mpu401_unregister_all();
+ return -ENODEV;
}
return 0;
-
- errout:
- snd_mpu401_unregister_all();
- return err;
}
static void __exit alsa_card_mpu401_exit(void)
Index: local/sound/drivers/serial-u16550.c
===================================================================
--- local.orig/sound/drivers/serial-u16550.c 2006-04-13 03:03:50.000000000 +0200
+++ local/sound/drivers/serial-u16550.c 2006-04-13 03:11:35.000000000 +0200
@@ -995,10 +995,8 @@ static int __init alsa_card_serial_init(
continue;
device = platform_device_register_simple(SND_SERIAL_DRIVER,
i, NULL, 0);
- if (IS_ERR(device)) {
- err = PTR_ERR(device);
- goto errout;
- }
+ if (IS_ERR(device))
+ continue;
devices[i] = device;
cards++;
}
@@ -1006,14 +1004,10 @@ static int __init alsa_card_serial_init(
#ifdef MODULE
printk(KERN_ERR "serial midi soundcard not found or device busy\n");
#endif
- err = -ENODEV;
- goto errout;
+ snd_serial_unregister_all();
+ return -ENODEV;
}
return 0;
-
- errout:
- snd_serial_unregister_all();
- return err;
}
static void __exit alsa_card_serial_exit(void)
Index: local/sound/drivers/virmidi.c
===================================================================
--- local.orig/sound/drivers/virmidi.c 2006-04-13 03:04:17.000000000 +0200
+++ local/sound/drivers/virmidi.c 2006-04-13 03:11:35.000000000 +0200
@@ -169,10 +169,8 @@ static int __init alsa_card_virmidi_init
continue;
device = platform_device_register_simple(SND_VIRMIDI_DRIVER,
i, NULL, 0);
- if (IS_ERR(device)) {
- err = PTR_ERR(device);
- goto errout;
- }
+ if (IS_ERR(device))
+ continue;
devices[i] = device;
cards++;
}
@@ -180,14 +178,10 @@ static int __init alsa_card_virmidi_init
#ifdef MODULE
printk(KERN_ERR "Card-VirMIDI soundcard not found or device busy\n");
#endif
- err = -ENODEV;
- goto errout;
+ snd_virmidi_unregister_all();
+ return -ENODEV;
}
return 0;
-
- errout:
- snd_virmidi_unregister_all();
- return err;
}
static void __exit alsa_card_virmidi_exit(void)
Index: local/sound/drivers/dummy.c
===================================================================
--- local.orig/sound/drivers/dummy.c 2006-04-13 03:02:43.000000000 +0200
+++ local/sound/drivers/dummy.c 2006-04-13 03:11:35.000000000 +0200
@@ -675,10 +675,8 @@ static int __init alsa_card_dummy_init(v
continue;
device = platform_device_register_simple(SND_DUMMY_DRIVER,
i, NULL, 0);
- if (IS_ERR(device)) {
- err = PTR_ERR(device);
- goto errout;
- }
+ if (IS_ERR(device))
+ continue;
devices[i] = device;
cards++;
}
@@ -686,14 +684,10 @@ static int __init alsa_card_dummy_init(v
#ifdef MODULE
printk(KERN_ERR "Dummy soundcard not found or device busy\n");
#endif
- err = -ENODEV;
- goto errout;
+ snd_dummy_unregister_all();
+ return -ENODEV;
}
return 0;
-
- errout:
- snd_dummy_unregister_all();
- return err;
}
static void __exit alsa_card_dummy_exit(void)
reply other threads:[~2006-04-13 1:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=443DAD1F.3070802@keyaccess.nl \
--to=rene.herman@keyaccess.nl \
--cc=alsa-devel@alsa-project.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox