Merge "msm: qdsp5v2: memset stack buffer allocation." (b9bcc59c) · Commits · e / devices / android_kernel_sony_msm8994

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

+3 −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
		@@ -773,6 +773,7 @@ static long audevrc_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)))
		@@ -987,6 +988,7 @@ static ssize_t audevrc_in_read(struct file *file,
		struct evrc_encoded_meta_out meta_field;
		struct audio_frame_nt *nt_frame;
		MM_DBG("count = %d\n", count);
		memset(&meta_field, 0, sizeof(meta_field));
		mutex_lock(&audio->read_lock);
		while (count > 0) {
		rc = wait_event_interruptible(