diff options
Diffstat (limited to 'sound/core/timer.c')
-rw-r--r-- | sound/core/timer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 4104f6e292e9..22b104624084 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c | |||
@@ -98,7 +98,7 @@ static void snd_timer_reschedule(snd_timer_t * timer, unsigned long ticks_left); | |||
98 | static snd_timer_instance_t *snd_timer_instance_new(char *owner, snd_timer_t *timer) | 98 | static snd_timer_instance_t *snd_timer_instance_new(char *owner, snd_timer_t *timer) |
99 | { | 99 | { |
100 | snd_timer_instance_t *timeri; | 100 | snd_timer_instance_t *timeri; |
101 | timeri = kcalloc(1, sizeof(*timeri), GFP_KERNEL); | 101 | timeri = kzalloc(sizeof(*timeri), GFP_KERNEL); |
102 | if (timeri == NULL) | 102 | if (timeri == NULL) |
103 | return NULL; | 103 | return NULL; |
104 | timeri->owner = kstrdup(owner, GFP_KERNEL); | 104 | timeri->owner = kstrdup(owner, GFP_KERNEL); |
@@ -764,7 +764,7 @@ int snd_timer_new(snd_card_t *card, char *id, snd_timer_id_t *tid, snd_timer_t * | |||
764 | snd_assert(tid != NULL, return -EINVAL); | 764 | snd_assert(tid != NULL, return -EINVAL); |
765 | snd_assert(rtimer != NULL, return -EINVAL); | 765 | snd_assert(rtimer != NULL, return -EINVAL); |
766 | *rtimer = NULL; | 766 | *rtimer = NULL; |
767 | timer = kcalloc(1, sizeof(*timer), GFP_KERNEL); | 767 | timer = kzalloc(sizeof(*timer), GFP_KERNEL); |
768 | if (timer == NULL) | 768 | if (timer == NULL) |
769 | return -ENOMEM; | 769 | return -ENOMEM; |
770 | timer->tmr_class = tid->dev_class; | 770 | timer->tmr_class = tid->dev_class; |
@@ -1017,7 +1017,7 @@ static int snd_timer_register_system(void) | |||
1017 | return err; | 1017 | return err; |
1018 | strcpy(timer->name, "system timer"); | 1018 | strcpy(timer->name, "system timer"); |
1019 | timer->hw = snd_timer_system; | 1019 | timer->hw = snd_timer_system; |
1020 | priv = kcalloc(1, sizeof(*priv), GFP_KERNEL); | 1020 | priv = kzalloc(sizeof(*priv), GFP_KERNEL); |
1021 | if (priv == NULL) { | 1021 | if (priv == NULL) { |
1022 | snd_timer_free(timer); | 1022 | snd_timer_free(timer); |
1023 | return -ENOMEM; | 1023 | return -ENOMEM; |
@@ -1202,7 +1202,7 @@ static int snd_timer_user_open(struct inode *inode, struct file *file) | |||
1202 | { | 1202 | { |
1203 | snd_timer_user_t *tu; | 1203 | snd_timer_user_t *tu; |
1204 | 1204 | ||
1205 | tu = kcalloc(1, sizeof(*tu), GFP_KERNEL); | 1205 | tu = kzalloc(sizeof(*tu), GFP_KERNEL); |
1206 | if (tu == NULL) | 1206 | if (tu == NULL) |
1207 | return -ENOMEM; | 1207 | return -ENOMEM; |
1208 | spin_lock_init(&tu->qlock); | 1208 | spin_lock_init(&tu->qlock); |
@@ -1513,7 +1513,7 @@ static int snd_timer_user_info(struct file *file, snd_timer_info_t __user *_info | |||
1513 | t = tu->timeri->timer; | 1513 | t = tu->timeri->timer; |
1514 | snd_assert(t != NULL, return -ENXIO); | 1514 | snd_assert(t != NULL, return -ENXIO); |
1515 | 1515 | ||
1516 | info = kcalloc(1, sizeof(*info), GFP_KERNEL); | 1516 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
1517 | if (! info) | 1517 | if (! info) |
1518 | return -ENOMEM; | 1518 | return -ENOMEM; |
1519 | info->card = t->card ? t->card->number : -1; | 1519 | info->card = t->card ? t->card->number : -1; |