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/timer.c | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| parent | 967b1307b69b8ada8b331e01046ad1ef83742e99 (diff) | |
Merge branch 'for-next' into topic/hda-core
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 490b489d713d..a9a1a047c521 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c | |||
| @@ -774,10 +774,8 @@ int snd_timer_new(struct snd_card *card, char *id, struct snd_timer_id *tid, | |||
| 774 | if (rtimer) | 774 | if (rtimer) |
| 775 | *rtimer = NULL; | 775 | *rtimer = NULL; |
| 776 | timer = kzalloc(sizeof(*timer), GFP_KERNEL); | 776 | timer = kzalloc(sizeof(*timer), GFP_KERNEL); |
| 777 | if (timer == NULL) { | 777 | if (!timer) |
| 778 | pr_err("ALSA: timer: cannot allocate\n"); | ||
| 779 | return -ENOMEM; | 778 | return -ENOMEM; |
| 780 | } | ||
| 781 | timer->tmr_class = tid->dev_class; | 779 | timer->tmr_class = tid->dev_class; |
| 782 | timer->card = card; | 780 | timer->card = card; |
| 783 | timer->tmr_device = tid->device; | 781 | timer->tmr_device = tid->device; |