vserver 1.9.5.x5

[linux-2.6.git] / sound / core / ioctl32 / timer32.c

diff --git a/sound/core/ioctl32/timer32.c b/sound/core/ioctl32/timer32.c
index ce49daa..5f1a2d9 100644 (file)
--- a/sound/core/ioctl32/timer32.c
+++ b/sound/core/ioctl32/timer32.c
@@ -41,9 +41,9 @@ struct sndrv_timer_info32 {
 {\
        COPY(flags);\
        COPY(card);\
-       memcpy(dst->id, src->id, sizeof(src->id));\
-       memcpy(dst->name, src->name, sizeof(src->name));\
-       COPY(resolution);\
+       COPY_ARRAY(id);\
+       COPY_ARRAY(name);\
+       COPY_CVT(resolution);\
 }
 
 struct sndrv_timer_status32 {
@@ -57,8 +57,8 @@ struct sndrv_timer_status32 {
 
 #define CVT_sndrv_timer_status()\
 {\
-       COPY(tstamp.tv_sec);\
-       COPY(tstamp.tv_nsec);\
+       COPY_CVT(tstamp.tv_sec);\
+       COPY_CVT(tstamp.tv_nsec);\
        COPY(resolution);\
        COPY(lost);\
        COPY(overrun);\