Skip to contentSkip to conversation

ALSA: pcm: Fix driver_tstamp value reporting

PATCH Applied Amadeusz Sławiński 2 participants 2 messages Oct 13 – Oct 14 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: pcm: Fix driver_tstamp value reporting

In some cases (system32 and compat64) due to incorrect assignment wrong value is being reported. Fix it.

Fixes 3ddee7f88aaf ("ALSA: Avoid using timespec for struct snd_pcm_status")
---
 sound/core/pcm_compat.c | 4 ++--
 sound/core/pcm_native.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
sound/core/pcm_compat.c +2 -2
index 55ecf87586c4..359197aa6076 100644
@@ -219,8 +219,8 @@ static int snd_pcm_status_user_compat64(struct snd_pcm_substream *substream,
 		.audio_tstamp_data = status.audio_tstamp_data,
 		.audio_tstamp_sec = status.audio_tstamp_sec,
 		.audio_tstamp_nsec = status.audio_tstamp_nsec,
-		.driver_tstamp_sec = status.audio_tstamp_sec,
-		.driver_tstamp_nsec = status.audio_tstamp_nsec,
+		.driver_tstamp_sec = status.driver_tstamp_sec,
+		.driver_tstamp_nsec = status.driver_tstamp_nsec,
 		.audio_tstamp_accuracy = status.audio_tstamp_accuracy,
 	};
 
sound/core/pcm_native.c +2 -2
index f774358629bb..fcd3594e4bdf 100644
@@ -1206,8 +1206,8 @@ static int snd_pcm_status_user32(struct snd_pcm_substream *substream,
 		.audio_tstamp_data = status64.audio_tstamp_data,
 		.audio_tstamp_sec = status64.audio_tstamp_sec,
 		.audio_tstamp_nsec = status64.audio_tstamp_nsec,
-		.driver_tstamp_sec = status64.audio_tstamp_sec,
-		.driver_tstamp_nsec = status64.audio_tstamp_nsec,
+		.driver_tstamp_sec = status64.driver_tstamp_sec,
+		.driver_tstamp_nsec = status64.driver_tstamp_nsec,
 		.audio_tstamp_accuracy = status64.audio_tstamp_accuracy,
 	};
 
Signature · 1 line
2.56.0
Applied
#1 lore raw
Quoted 6 lines · Amadeusz Sławiński

In some cases (system32 and compat64) due to incorrect assignment wrong value is being reported. Fix it.

Fixes 3ddee7f88aaf ("ALSA: Avoid using timespec for struct snd_pcm_status")

Applied to for-next branch. Thanks.

Takashi