Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 9b92417b authored Oct 15, 2013 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Oct 15, 2013

Merge "qdsp5: memset stack buffer allocation."

parents 08f56940 c59298c1

arch/arm/mach-msm/qdsp5/audio_amrnb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		*
		* amrnb audio decoder device
		*
		* Copyright (c) 2008-2009, 2011-2012 The Linux Foundation. All rights reserved.
		* Copyright (c) 2008-2009, 2011-2013 The Linux Foundation. All rights reserved.
		*
		* Based on the mp3 native driver in arch/arm/mach-msm/qdsp5/audio_mp3.c
		*

arch/arm/mach-msm/qdsp5/audio_amrnb_in.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		*
		* amrnb encoder device
		*
		* Copyright (c) 2009, 2011-2012 The Linux Foundation. All rights reserved.
		* Copyright (c) 2009, 2011-2013 The Linux Foundation. All rights reserved.
		*
		* This code is based in part on arch/arm/mach-msm/qdsp5/audio_in.c, which is
		* Copyright (C) 2008 Google, Inc.
		@@ -742,6 +742,7 @@ static long audamrnb_in_ioctl(struct file *file,
		MM_DBG("\n");
		if (cmd == AUDIO_GET_STATS) {
		struct msm_audio_stats stats;
		memset(&stats, 0, sizeof(stats));
		stats.byte_count = atomic_read(&audio->in_bytes);
		stats.sample_count = atomic_read(&audio->in_samples);
		if (copy_to_user((void *) arg, &stats, sizeof(stats)))

arch/arm/mach-msm/qdsp5/audio_qcelp_in.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		*
		* qcelp audio input device
		*
		* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
		* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
		*
		* This code is based in part on arch/arm/mach-msm/qdsp5v2/audio_qcelp_in.c,
		* Copyright (C) 2008 Google, Inc.
		@@ -732,6 +732,7 @@ static long audqcelp_in_ioctl(struct file *file,
		MM_DBG("\n");
		if (cmd == AUDIO_GET_STATS) {
		struct msm_audio_stats stats;
		memset(&stats, 0, sizeof(stats));
		stats.byte_count = atomic_read(&audio->in_bytes);
		stats.sample_count = atomic_read(&audio->in_samples);
		if (copy_to_user((void *) arg, &stats, sizeof(stats)))

arch/arm/mach-msm/qdsp5/audio_voicememo.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		*
		* Copyright (C) 2008 Google, Inc.
		* Copyright (C) 2008 HTC Corporation
		* Copyright (c) 2009-2012, The Linux Foundation. All rights reserved.
		* Copyright (c) 2009-2013, The Linux Foundation. All rights reserved.
		*
		* This code is based in part on arch/arm/mach-msm/qdsp5/audio_mp3.c
		*
		@@ -644,6 +644,7 @@ static long audio_voicememo_ioctl(struct file *file,

		if (cmd == AUDIO_GET_STATS) {
		struct msm_audio_stats stats;
		memset(&stats, 0, sizeof(stats));
		mutex_lock(&audio->dsp_lock);
		stats.byte_count = audio->byte_count;
		stats.sample_count = audio->frame_count;

arch/arm/mach-msm/qdsp5v2/audio_amrnb_in.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* Copyright (C) 2008 Google, Inc.
		* Copyright (C) 2008 HTC Corporation
		* Copyright (c) 2009-2012, The Linux Foundation. All rights reserved.
		* Copyright (c) 2009-2013, The Linux Foundation. All rights reserved.
		*
		* This software is licensed under the terms of the GNU General Public
		* License version 2, as published by the Free Software Foundation, and
		@@ -503,6 +503,7 @@ static long audamrnb_in_ioctl(struct file *file,

		if (cmd == AUDIO_GET_STATS) {
		struct msm_audio_stats stats;
		memset(&stats, 0, sizeof(stats));
		stats.byte_count = atomic_read(&audio->in_bytes);
		stats.sample_count = atomic_read(&audio->in_samples);
		if (copy_to_user((void *) arg, &stats, sizeof(stats)))