Merge 0bcc2dc22f ("Merge tag 'perf-core-2026-06-14' of gitolite.kernel.org:pub/scm/linux/kernel/git/tip/tip") into android-mainline
Steps on the way to v7.2-rc1 Change-Id: Ib9de5e1b1bef99f6362967010a731260c391363d Signed-off-by: Carlos Llamas <cmllamas@google.com>
This commit is contained in:
commit
0a9bbef6a5
167 files changed
+5351
-2045
No files matched your search
@@ -491,9 +491,9 @@ static int azx_get_time_info(struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_audio_tstamp_config *audio_tstamp_config,
|
||||
struct snd_pcm_audio_tstamp_report *audio_tstamp_report)
|
||||
{
|
||||
struct system_device_crosststamp xtstamp = { .clock_id = CLOCK_REALTIME };
|
||||
struct azx_dev *azx_dev = get_azx_dev(substream);
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct system_device_crosststamp xtstamp;
|
||||
int ret;
|
||||
u64 nsec;
|
||||
|
||||
@@ -527,7 +527,7 @@ static int azx_get_time_info(struct snd_pcm_substream *substream,
|
||||
break;
|
||||
|
||||
default:
|
||||
*system_ts = ktime_to_timespec64(xtstamp.sys_realtime);
|
||||
*system_ts = ktime_to_timespec64(xtstamp.sys_systime);
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user