diff --git a/kernel/trunk/drivers/infinity.asm b/kernel/trunk/drivers/infinity.asm
index ba03bc5eb7..553afbe9b5 100644
--- a/kernel/trunk/drivers/infinity.asm
+++ b/kernel/trunk/drivers/infinity.asm
@@ -348,13 +348,21 @@ align 4
         cmp     [edi+inp_size], 12
         jne     .fail
 
-        mov     eax, [ebx]
-        mov     ebx, [ebx+4]
+        mov     eax, [ebx+4]
+        mov     ebx, [ebx+8]
+
+        pushfd
+        cli
         mov     dword [edx+STREAM.time_base], eax
         mov     dword [edx+STREAM.time_base+4], ebx
         xor     eax, eax
+        mov     dword [edx+STREAM.time_stamp], eax
+        mov     dword [edx+STREAM.time_stamp+4], eax
+        popfd
+
         ret
 
+align 4
 .snd_gettimestamp:
         cmp     [edi+out_size], 8
         jne     .fail
@@ -371,7 +379,10 @@ align 4
 
         mov     eax, esp
 
+        push    ebx
+        push    ecx
         push    edx
+        push    esi
         push    edi
 
         push    4              ;.out_size
@@ -386,7 +397,10 @@ align 4
         add     esp, 6*4
 
         pop     edi
+        pop     esi
         pop     edx
+        pop     ecx
+        pop     ebx
 
         test    eax, eax
         jz      @F