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

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

Merge "misc: qcom: qdsp6v2: Add missing initialization"

parents 613cea7b 0950fbd3

drivers/misc/qcom/qdsp6v2/audio_utils.c

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2016, 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
@@ -588,6 +588,7 @@ long audio_in_compat_ioctl(struct file *file, 
	}

	case AUDIO_GET_CONFIG_32: {

		struct msm_audio_config32 cfg_32;

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

		cfg_32.buffer_size = audio->pcm_cfg.buffer_size;

		cfg_32.buffer_count = audio->pcm_cfg.buffer_count;

		cfg_32.channel_count = audio->pcm_cfg.channel_count;

drivers/misc/qcom/qdsp6v2/audio_utils_aio.c

+1 −0
Original line number Diff line number Diff line
@@ -1935,6 +1935,7 @@ static long audio_aio_compat_ioctl(struct file *file, unsigned int cmd, 
	case AUDIO_GET_CONFIG_32: {

		struct msm_audio_config32 cfg_32;

		mutex_lock(&audio->lock);

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

		cfg_32.buffer_size = audio->pcm_cfg.buffer_size;

		cfg_32.buffer_count = audio->pcm_cfg.buffer_count;

		cfg_32.channel_count = audio->pcm_cfg.channel_count;