summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorHenrik Kretzschmar <henne@nachtwindheim.de>2005-07-08 13:53:42 +0200
committerJaroslav Kysela <perex@suse.cz>2005-07-28 12:22:07 +0200
commit856def8a4695066e6cbd2919c5987f1df23dbe8a (patch)
tree02e6415474130e33fb08cc57eb8ff3b4ceff452b /sound/core
parent5b738babf13d51285710ed57336ee5f072ac9490 (diff)
downloadtalos-obmc-linux-856def8a4695066e6cbd2919c5987f1df23dbe8a.tar.gz
talos-obmc-linux-856def8a4695066e6cbd2919c5987f1df23dbe8a.zip
[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 <henne@nachtwindheim.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/info.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/core/info.c b/sound/core/info.c
index 5e122bbe7c92..7f8bdf7b0058 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);
OpenPOWER on IntegriCloud