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

Commit 0b89b3f1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: qdsp6v2: memset stack buffer allocation."

parents e39b1dd3 305eda51

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

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 Google, Inc.

 * Copyright (C) 2009 HTC Corporation

 * Copyright (c) 2010-2012, The Linux Foundation. All rights reserved.

 * Copyright (c) 2010-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
@@ -256,6 +256,7 @@ static long pcm_in_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	}

	case AUDIO_GET_CONFIG: {

		struct msm_audio_config config;

		memset(&config, 0, sizeof(config));

		config.buffer_size = pcm->buffer_size;

		config.buffer_count = pcm->buffer_count;

		config.sample_rate = pcm->sample_rate;

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

+2 −1
Original line number Diff line number Diff line 


/* Copyright (c) 2012, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License version 2 and
@@ -475,6 +475,7 @@ static long pcm_in_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	}

	case AUDIO_GET_CONFIG: {

		struct msm_audio_config config;

		memset(&config, 0, sizeof(config));

		config.buffer_size = pcm->buffer_size;

		config.buffer_count = pcm->buffer_count;

		config.sample_rate = pcm->sample_rate;