aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorEugene Teo <eugene.teo@eugeneteo.net>2006-03-17 16:32:17 +0100
committerJaroslav Kysela <perex@suse.cz>2006-03-22 10:39:23 +0100
commite64d2e36236175a56fd1d8b2acd784e21bdc7de6 (patch)
treee58d5a4e3f570aa46e66dc7d80ca524fc33d1b57 /sound/core
parent825aa97241b46d2819c1db984c86a1a9df41b8e1 (diff)
downloadkernel_samsung_smdk4412-e64d2e36236175a56fd1d8b2acd784e21bdc7de6.zip
kernel_samsung_smdk4412-e64d2e36236175a56fd1d8b2acd784e21bdc7de6.tar.gz
kernel_samsung_smdk4412-e64d2e36236175a56fd1d8b2acd784e21bdc7de6.tar.bz2
[ALSA] Fix seq_clientmgr dereferences before NULL check
Modules: ALSA sequencer cptr->pool must be non-NULL there, so just the if (cptr->pool) is superfluous. Thanks Takashi. Signed-off-by: Eugene Teo <eugene.teo@eugeneteo.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/seq/seq_clientmgr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index aae6420..bb15d9e 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -1866,8 +1866,7 @@ static int snd_seq_ioctl_get_client_pool(struct snd_seq_client *client,
info.output_pool = cptr->pool->size;
info.output_room = cptr->pool->room;
info.output_free = info.output_pool;
- if (cptr->pool)
- info.output_free = snd_seq_unused_cells(cptr->pool);
+ info.output_free = snd_seq_unused_cells(cptr->pool);
if (cptr->type == USER_CLIENT) {
info.input_pool = cptr->data.user.fifo_pool_size;
info.input_free = info.input_pool;