diff options
author | Oliver Neukum <oneukum@suse.de> | 2007-01-16 11:49:21 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 03:03:04 -0500 |
commit | 5c33dd70b51be0617a75562aa896d5ccf1840455 (patch) | |
tree | 9893efa106b79650d1c2c73dc12729e125cc5cc5 /sound/core/init.c | |
parent | ad4d1dea62b6981a8c12df529e955424141d4b7a (diff) |
[ALSA] cleanup and error reporting for sound/core/init.c
Make the control flow clear with indentation, adds some comments
and improves error reporting.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/core/init.c')
-rw-r--r-- | sound/core/init.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index a4cc6b155ae9..db6103733742 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -114,22 +114,28 @@ struct snd_card *snd_card_new(int idx, const char *xid, | |||
114 | if (idx < 0) { | 114 | if (idx < 0) { |
115 | int idx2; | 115 | int idx2; |
116 | for (idx2 = 0; idx2 < SNDRV_CARDS; idx2++) | 116 | for (idx2 = 0; idx2 < SNDRV_CARDS; idx2++) |
117 | /* idx == -1 == 0xffff means: take any free slot */ | ||
117 | if (~snd_cards_lock & idx & 1<<idx2) { | 118 | if (~snd_cards_lock & idx & 1<<idx2) { |
118 | idx = idx2; | 119 | idx = idx2; |
119 | if (idx >= snd_ecards_limit) | 120 | if (idx >= snd_ecards_limit) |
120 | snd_ecards_limit = idx + 1; | 121 | snd_ecards_limit = idx + 1; |
121 | break; | 122 | break; |
122 | } | 123 | } |
123 | } else if (idx < snd_ecards_limit) { | 124 | } else { |
124 | if (snd_cards_lock & (1 << idx)) | 125 | if (idx < snd_ecards_limit) { |
125 | err = -ENODEV; /* invalid */ | 126 | if (snd_cards_lock & (1 << idx)) |
126 | } else if (idx < SNDRV_CARDS) | 127 | err = -EBUSY; /* invalid */ |
127 | snd_ecards_limit = idx + 1; /* increase the limit */ | 128 | } else { |
128 | else | 129 | if (idx < SNDRV_CARDS) |
129 | err = -ENODEV; | 130 | snd_ecards_limit = idx + 1; /* increase the limit */ |
131 | else | ||
132 | err = -ENODEV; | ||
133 | } | ||
134 | } | ||
130 | if (idx < 0 || err < 0) { | 135 | if (idx < 0 || err < 0) { |
131 | mutex_unlock(&snd_card_mutex); | 136 | mutex_unlock(&snd_card_mutex); |
132 | snd_printk(KERN_ERR "cannot find the slot for index %d (range 0-%i)\n", idx, snd_ecards_limit - 1); | 137 | snd_printk(KERN_ERR "cannot find the slot for index %d (range 0-%i), error: %d\n", |
138 | idx, snd_ecards_limit - 1, err); | ||
133 | goto __error; | 139 | goto __error; |
134 | } | 140 | } |
135 | snd_cards_lock |= 1 << idx; /* lock it */ | 141 | snd_cards_lock |= 1 << idx; /* lock it */ |