commit 2797112287bde57ed8253986a85ca4e3404d832b
author Linux Build Service Account <lnxbuild@localhost> Mon Sep 24 17:17:53 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 24 17:17:30 2012 -0700
tree bfc8389564fbd51bc903a30ffb7040230dd18a02
parent 6be11d83b2ae744799a7d8659e47004c304419e1
parent 388cdc5346ec9552c3d49e67383cabd03a1e2248

Merge "msm: audio: qdsp6v2: Support qdsp6 timestamp query"

arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c

diff --git a/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c b/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
index 2e4b756..84a79cd 100644
--- a/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
+++ b/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
@@ -1057,8 +1057,14 @@
 	switch (cmd) {
 	case AUDIO_GET_STATS: {
 		struct msm_audio_stats stats;
+		uint64_t timestamp;
 		stats.byte_count = atomic_read(&audio->in_bytes);
 		stats.sample_count = atomic_read(&audio->in_samples);
+		timestamp = q6asm_get_session_time(audio->ac);
+		if (timestamp >= 0)
+			memcpy(&stats.unused[0], &timestamp, sizeof(timestamp));
+		else
+			pr_debug("Error while getting timestamp\n");
 		if (copy_to_user((void *)arg, &stats, sizeof(stats)))
 			rc = -EFAULT;
 		break;