From 31e9c564e0026449319961dffb5fc7aa78b7b67c Mon Sep 17 00:00:00 2001
From: crescent <sunhehe@huawei.com>
Date: Tue, 20 Jul 2021 08:34:41 +0000
Subject: [PATCH] clean audio codex

Signed-off-by: crescent <sunhehe@huawei.com>
---
 model/audio/core/src/audio_core.c  |  6 +++---
 model/audio/core/src/audio_parse.c |  2 +-
 model/audio/sapm/src/audio_sapm.c  | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/model/audio/core/src/audio_core.c b/model/audio/core/src/audio_core.c
index da1d36004..58bb8d14c 100755
--- a/model/audio/core/src/audio_core.c
+++ b/model/audio/core/src/audio_core.c
@@ -406,7 +406,7 @@ int32_t AudioBindDaiLink(struct AudioCard *audioCard, struct AudioConfigData *co
 int32_t AudioUpdateCodecRegBits(struct CodecDevice *codec, struct AudioMixerControl *mixerControl, int32_t value)
 {
     int32_t ret;
-    uint32_t curValue;
+    uint32_t curValue = 0;
     int32_t mixerControlMask;
     if (codec == NULL || codec->devData == NULL || codec->devData->Write == NULL || mixerControl == NULL) {
         ADM_LOG_ERR("Invalid accessory param.");
@@ -440,7 +440,7 @@ int32_t AudioUpdateAccessoryRegBits(struct AccessoryDevice *accessory,
     struct AudioMixerControl *mixerControl, int32_t value)
 {
     int32_t ret;
-    uint32_t curValue;
+    uint32_t curValue = 0;
     int32_t mixerControlMask;
     if (accessory == NULL || accessory->devData == NULL ||
         accessory->devData->Write == NULL || mixerControl == NULL) {
@@ -502,7 +502,7 @@ int32_t AudioUpdateRegBits(enum AudioDeviceType deviceType, void *device,
 int32_t AudioAiaoUpdateRegBits(struct CodecDevice *codec, uint32_t reg, uint32_t mask, uint32_t shift, int32_t value)
 {
     int32_t ret;
-    uint32_t curValue;
+    uint32_t curValue = 0;
     ADM_LOG_DEBUG("Entry to update AIAO reg bits.");
 
     if (codec == NULL || codec->devData == NULL || codec->devData->AiaoWrite == NULL) {
diff --git a/model/audio/core/src/audio_parse.c b/model/audio/core/src/audio_parse.c
index 7de9056ef..13a68cfbc 100755
--- a/model/audio/core/src/audio_parse.c
+++ b/model/audio/core/src/audio_parse.c
@@ -44,7 +44,7 @@ int32_t AudioFillConfigData(struct HdfDeviceObject *device, struct AudioConfigDa
     if (serviceRet || codecRet || platformRet || cpuRet || codeDaiRet ||
         dspRet || dspDaiRet || accessoryRet || accessoryDaiRet) {
         ADM_LOG_ERR("Read audioDeviceName fail: serviceRet=%d, codecRet=%d, platformRet=%d, cpuRet=%d, codeDaiRet=%d,"
-            "dspRet=%d, dspDaiRet=%d, accessoryRet=%d, accessoryDaiRet=%s",
+            "dspRet=%d, dspDaiRet=%d, accessoryRet=%d, accessoryDaiRet=%d",
             serviceRet, codecRet, platformRet, cpuRet, codeDaiRet, dspRet,
             dspDaiRet, accessoryRet, accessoryDaiRet);
         return HDF_FAILURE;
diff --git a/model/audio/sapm/src/audio_sapm.c b/model/audio/sapm/src/audio_sapm.c
index 19def3b21..26e4ac366 100755
--- a/model/audio/sapm/src/audio_sapm.c
+++ b/model/audio/sapm/src/audio_sapm.c
@@ -317,9 +317,9 @@ static void MuxSetPathStatus(const struct AudioSapmComponent *cpt, struct AudioS
     const struct AudioEnumKcontrol *enumKtl, int32_t i)
 {
     int32_t ret;
-    uint32_t val;
+    uint32_t val = 0;
     int32_t item;
-    uint32_t reg;
+    uint32_t reg = 0;
     uint32_t shift;
 
     if ((cpt == NULL) || (path == NULL) || (enumKtl == NULL)) {
@@ -349,7 +349,7 @@ static void MuxValueSetPathStatus(const struct AudioSapmComponent *cpt, struct A
     const struct AudioEnumKcontrol *enumKtl, int32_t i)
 {
     int32_t ret;
-    uint32_t val;
+    uint32_t val = 0;
     uint32_t item;
     uint32_t reg = 0;
     uint32_t shift;
@@ -389,7 +389,7 @@ static void MixerSetPathStatus(const struct AudioSapmComponent *cpt, struct Audi
     uint32_t mask;
     uint32_t shift;
     uint32_t invert;
-    uint32_t curValue;
+    uint32_t curValue = 0;
 
     if ((cpt == NULL) || (path == NULL) || (mixerCtrl == NULL)) {
         ADM_LOG_ERR("input params check error: cpt=%p, path=%p, mixerCtrl=%p.", cpt, path, mixerCtrl);
@@ -871,7 +871,7 @@ int32_t AudioSapmPowerComponents(struct AudioCard *audioCard)
 static void ReadInitComponentPowerStatus(struct AudioSapmComponent *cpt)
 {
     int32_t ret;
-    uint32_t regVal;
+    uint32_t regVal = 0;
 
     if (cpt == NULL) {
         ADM_LOG_ERR("input param cpt is NULL.");
@@ -1068,7 +1068,7 @@ int32_t AudioSapmPutCtrlSwSub(struct AudioKcontrol *kcontrol, struct AudioCtrlEl
     int32_t ret = HDF_FAILURE;
     void *device = NULL;
     enum AudioDeviceType deviceType;
-    uint32_t curValue;
+    uint32_t curValue = 0;
     struct CodecDevice *codec = AudioKcontrolGetCodec(kcontrol);
     struct AccessoryDevice *accessory = AudioKcontrolGetAccessory(kcontrol);
 
-- 
Gitee