diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-26 22:22:36 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-26 22:22:36 -0700 |
| commit | 7275a2b7bb007ff78728a8b6c56ed5d2b4e62c8b (patch) | |
| tree | 0eece1f7b778c530e9ba500d6b88cd5f22a3f8dd | |
| parent | c41f5ad0997f1cfa8c81a1a1bcf0446dffa95626 (diff) | |
| parent | 94cae8078094b8aacfbf6282bffd207b05294315 (diff) | |
Merge "misc: qcom: qdsp6v2: initialize wma_config_32"
| -rw-r--r-- | drivers/misc/qcom/qdsp6v2/audio_wma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/misc/qcom/qdsp6v2/audio_wma.c b/drivers/misc/qcom/qdsp6v2/audio_wma.c index 3d57d38d0fd1..74f678da925a 100644 --- a/drivers/misc/qcom/qdsp6v2/audio_wma.c +++ b/drivers/misc/qcom/qdsp6v2/audio_wma.c @@ -2,7 +2,7 @@ * * Copyright (C) 2008 Google, Inc. * Copyright (C) 2008 HTC Corporation - * Copyright (c) 2009-2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2009-2016, 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 @@ -166,6 +166,8 @@ static long audio_compat_ioctl(struct file *file, unsigned int cmd, struct msm_audio_wma_config_v2 *wma_config; struct msm_audio_wma_config_v2_32 wma_config_32; + memset(&wma_config_32, 0, sizeof(wma_config_32)); + wma_config = (struct msm_audio_wma_config_v2 *)audio->codec_cfg; wma_config_32.format_tag = wma_config->format_tag; wma_config_32.numchannels = wma_config->numchannels; |