From: Oliver Neukum <oneukum@suse.de>
To: Jaroslav Kysela <perex@suse.cz>,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [patch]cleanup and error reporting for sound/core/init.c
Date: Fri, 12 Jan 2007 13:49:57 +0000 [thread overview]
Message-ID: <200701121449.58186.oneukum@suse.de> (raw)
Hi,
please accept this patch, which makes the control flow clear with
indentation, adds some comments and improves error reporting.
Regards
Oliver
Signed-off-by: Oliver Neukum <oneukum@suse.de>
--
--- a/sound/core/init.c 2007-01-12 14:26:47.000000000 +0100
+++ b/sound/core/init.c 2007-01-12 14:46:13.000000000 +0100
@@ -114,22 +114,26 @@
if (idx < 0) {
int idx2;
for (idx2 = 0; idx2 < SNDRV_CARDS; idx2++)
+ /* idx = -1 = 0xffff means: take any free slot */
if (~snd_cards_lock & idx & 1<<idx2) {
idx = idx2;
if (idx >= snd_ecards_limit)
snd_ecards_limit = idx + 1;
break;
}
- } else if (idx < snd_ecards_limit) {
- if (snd_cards_lock & (1 << idx))
- err = -ENODEV; /* invalid */
- } else if (idx < SNDRV_CARDS)
- snd_ecards_limit = idx + 1; /* increase the limit */
- else
- err = -ENODEV;
+ } else {
+ if (idx < snd_ecards_limit) {
+ if (snd_cards_lock & (1 << idx))
+ err = -EBUSY; /* invalid */
+ } else if (idx < SNDRV_CARDS)
+ snd_ecards_limit = idx + 1; /* increase the limit */
+ else
+ err = -ENODEV;
+ }
if (idx < 0 || err < 0) {
mutex_unlock(&snd_card_mutex);
- snd_printk(KERN_ERR "cannot find the slot for index %d (range 0-%i)\n", idx, snd_ecards_limit - 1);
+ snd_printk(KERN_ERR "cannot find the slot for index %d (range 0-%i), error: %d\n",
+ idx, snd_ecards_limit - 1, err);
goto __error;
}
snd_cards_lock |= 1 << idx; /* lock it */
WARNING: multiple messages have this Message-ID (diff)
From: Oliver Neukum <oneukum@suse.de>
To: Jaroslav Kysela <perex@suse.cz>,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [patch]cleanup and error reporting for sound/core/init.c
Date: Fri, 12 Jan 2007 14:49:57 +0100 [thread overview]
Message-ID: <200701121449.58186.oneukum@suse.de> (raw)
Hi,
please accept this patch, which makes the control flow clear with
indentation, adds some comments and improves error reporting.
Regards
Oliver
Signed-off-by: Oliver Neukum <oneukum@suse.de>
--
--- a/sound/core/init.c 2007-01-12 14:26:47.000000000 +0100
+++ b/sound/core/init.c 2007-01-12 14:46:13.000000000 +0100
@@ -114,22 +114,26 @@
if (idx < 0) {
int idx2;
for (idx2 = 0; idx2 < SNDRV_CARDS; idx2++)
+ /* idx == -1 == 0xffff means: take any free slot */
if (~snd_cards_lock & idx & 1<<idx2) {
idx = idx2;
if (idx >= snd_ecards_limit)
snd_ecards_limit = idx + 1;
break;
}
- } else if (idx < snd_ecards_limit) {
- if (snd_cards_lock & (1 << idx))
- err = -ENODEV; /* invalid */
- } else if (idx < SNDRV_CARDS)
- snd_ecards_limit = idx + 1; /* increase the limit */
- else
- err = -ENODEV;
+ } else {
+ if (idx < snd_ecards_limit) {
+ if (snd_cards_lock & (1 << idx))
+ err = -EBUSY; /* invalid */
+ } else if (idx < SNDRV_CARDS)
+ snd_ecards_limit = idx + 1; /* increase the limit */
+ else
+ err = -ENODEV;
+ }
if (idx < 0 || err < 0) {
mutex_unlock(&snd_card_mutex);
- snd_printk(KERN_ERR "cannot find the slot for index %d (range 0-%i)\n", idx, snd_ecards_limit - 1);
+ snd_printk(KERN_ERR "cannot find the slot for index %d (range 0-%i), error: %d\n",
+ idx, snd_ecards_limit - 1, err);
goto __error;
}
snd_cards_lock |= 1 << idx; /* lock it */
next reply other threads:[~2007-01-12 13:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-12 13:49 Oliver Neukum [this message]
2007-01-12 13:49 ` [patch]cleanup and error reporting for sound/core/init.c Oliver Neukum
2007-01-12 17:42 ` Takashi Iwai
2007-01-12 17:42 ` Takashi Iwai
2007-01-13 6:37 ` Oliver Neukum
2007-01-13 6:37 ` Oliver Neukum
2007-01-16 16:50 ` Takashi Iwai
2007-01-16 16:50 ` Takashi Iwai
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=200701121449.58186.oneukum@suse.de \
--to=oneukum@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@suse.cz \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.