diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
commit | 3372dbdd8ca11f51be8c6a30b2bc79eb04c4a902 (patch) | |
tree | d4499bf5a5665b4820ffaf96bce55bf6b895195e /sound/core/seq/seq_fifo.c | |
parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
parent | 967b1307b69b8ada8b331e01046ad1ef83742e99 (diff) |
Merge branch 'for-next' into topic/hda-core
Diffstat (limited to 'sound/core/seq/seq_fifo.c')
-rw-r--r-- | sound/core/seq/seq_fifo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c index 53a403e17c5b..1d5acbe0c08b 100644 --- a/sound/core/seq/seq_fifo.c +++ b/sound/core/seq/seq_fifo.c | |||
@@ -33,10 +33,8 @@ struct snd_seq_fifo *snd_seq_fifo_new(int poolsize) | |||
33 | struct snd_seq_fifo *f; | 33 | struct snd_seq_fifo *f; |
34 | 34 | ||
35 | f = kzalloc(sizeof(*f), GFP_KERNEL); | 35 | f = kzalloc(sizeof(*f), GFP_KERNEL); |
36 | if (f == NULL) { | 36 | if (!f) |
37 | pr_debug("ALSA: seq: malloc failed for snd_seq_fifo_new() \n"); | ||
38 | return NULL; | 37 | return NULL; |
39 | } | ||
40 | 38 | ||
41 | f->pool = snd_seq_pool_new(poolsize); | 39 | f->pool = snd_seq_pool_new(poolsize); |
42 | if (f->pool == NULL) { | 40 | if (f->pool == NULL) { |