From: Henrik Kretzschmar Date: Fri, 8 Jul 2005 11:53:42 +0000 (+0200) Subject: [ALSA] typo-fix and snd_assert()-expression-split X-Git-Tag: v2.6.13-rc4~3^2~17 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=856def8a4695066e6cbd2919c5987f1df23dbe8a;p=linux-2.6 [ALSA] typo-fix and snd_assert()-expression-split ALSA Core This patch corrects a typo in the kerneldocs of snd_info_get_str(). It also splits the expressions of snd_assert() in snd_info_unregister() into one-expression-per-call for better debugging. Signed-off-by: Henrik Kretzschmar Signed-off-by: Takashi Iwai --- diff --git a/sound/core/info.c b/sound/core/info.c index 5e122bbe7c..7f8bdf7b00 100644 --- a/sound/core/info.c +++ b/sound/core/info.c @@ -702,7 +702,7 @@ int snd_info_get_line(snd_info_buffer_t * buffer, char *line, int len) } /** - * snd_info_get_line - parse a string token + * snd_info_get_str - parse a string token * @dest: the buffer to store the string token * @src: the original string * @len: the max. length of token - 1 @@ -939,7 +939,8 @@ int snd_info_unregister(snd_info_entry_t * entry) { struct proc_dir_entry *root; - snd_assert(entry != NULL && entry->p != NULL, return -ENXIO); + snd_assert(entry != NULL, return -ENXIO); + snd_assert(entry->p != NULL, return -ENXIO); root = entry->parent == NULL ? snd_proc_root : entry->parent->p; snd_assert(root, return -ENXIO); down(&info_mutex);