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_timer.c | |
parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
parent | 967b1307b69b8ada8b331e01046ad1ef83742e99 (diff) |
Merge branch 'for-next' into topic/hda-core
Diffstat (limited to 'sound/core/seq/seq_timer.c')
-rw-r--r-- | sound/core/seq/seq_timer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c index e73605393eee..186f1611103c 100644 --- a/sound/core/seq/seq_timer.c +++ b/sound/core/seq/seq_timer.c | |||
@@ -56,10 +56,8 @@ struct snd_seq_timer *snd_seq_timer_new(void) | |||
56 | struct snd_seq_timer *tmr; | 56 | struct snd_seq_timer *tmr; |
57 | 57 | ||
58 | tmr = kzalloc(sizeof(*tmr), GFP_KERNEL); | 58 | tmr = kzalloc(sizeof(*tmr), GFP_KERNEL); |
59 | if (tmr == NULL) { | 59 | if (!tmr) |
60 | pr_debug("ALSA: seq: malloc failed for snd_seq_timer_new() \n"); | ||
61 | return NULL; | 60 | return NULL; |
62 | } | ||
63 | spin_lock_init(&tmr->lock); | 61 | spin_lock_init(&tmr->lock); |
64 | 62 | ||
65 | /* reset setup to defaults */ | 63 | /* reset setup to defaults */ |