tools headers UAPI: Sync drm/i915_drm.h with the kernel sources

[linux-2.6-microblaze.git] / sound / core / timer.c

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 765ea66..6898b1a 100644 (file)
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -959,7 +959,7 @@ int snd_timer_new(struct snd_card *card, char *id, struct snd_timer_id *tid,
        timer->tmr_device = tid->device;
        timer->tmr_subdevice = tid->subdevice;
        if (id)
-               strlcpy(timer->id, id, sizeof(timer->id));
+               strscpy(timer->id, id, sizeof(timer->id));
        timer->sticks = 1;
        INIT_LIST_HEAD(&timer->device_list);
        INIT_LIST_HEAD(&timer->open_list_head);
@@ -1659,8 +1659,8 @@ static int snd_timer_user_ginfo(struct file *file,
                ginfo->card = t->card ? t->card->number : -1;
                if (t->hw.flags & SNDRV_TIMER_HW_SLAVE)
                        ginfo->flags |= SNDRV_TIMER_FLG_SLAVE;
-               strlcpy(ginfo->id, t->id, sizeof(ginfo->id));
-               strlcpy(ginfo->name, t->name, sizeof(ginfo->name));
+               strscpy(ginfo->id, t->id, sizeof(ginfo->id));
+               strscpy(ginfo->name, t->name, sizeof(ginfo->name));
                ginfo->resolution = t->hw.resolution;
                if (t->hw.resolution_min > 0) {
                        ginfo->resolution_min = t->hw.resolution_min;
@@ -1814,8 +1814,8 @@ static int snd_timer_user_info(struct file *file,
        info->card = t->card ? t->card->number : -1;
        if (t->hw.flags & SNDRV_TIMER_HW_SLAVE)
                info->flags |= SNDRV_TIMER_FLG_SLAVE;
-       strlcpy(info->id, t->id, sizeof(info->id));
-       strlcpy(info->name, t->name, sizeof(info->name));
+       strscpy(info->id, t->id, sizeof(info->id));
+       strscpy(info->name, t->name, sizeof(info->name));
        info->resolution = t->hw.resolution;
        if (copy_to_user(_info, info, sizeof(*_info)))
                err = -EFAULT;