openharmony/drivers_framework
1
0
Fork 0
mirror of https://github.com/openharmony/drivers_framework.git synced 2026-08-26 18:17:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: audio issues from KORA tool

Browse Source 
Signed-off-by: xxxxyang <xiaoyang75@huawei.com>
This commit is contained in:
xxxxyang
2022-03-24 10:46:58 +08:00
parent 0296087e81
commit 33844c5031
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/audio/common/src/audio_accessory_base.c
+1 -5
View File
@@ -117,7 +117,7 @@ int32_t AccessoryI2cReadWrite(struct AudioAddrConfig *regAttr, uint16_t rwFlag)
(void)memset_s(msgs, sizeof(struct I2cMsg) * I2C_MSG_NUM, 0, sizeof(struct I2cMsg) * I2C_MSG_NUM);
AUDIO_DRIVER_LOG_DEBUG("entry.\n");
if (regAttr == NULL || rwFlag < 0 || rwFlag > 1) {
if (regAttr == NULL || rwFlag > 1) {
AUDIO_DRIVER_LOG_ERR("invalid parameter.");
return HDF_ERR_INVALID_PARAM;
}
@@ -187,10 +187,6 @@ int32_t AccessoryRegBitsUpdate(struct AudioMixerControl regAttr)
int32_t ret;
struct AudioAddrConfig regVal;
uint32_t newValue, newMask, value;
if (regAttr.reg < 0) {
AUDIO_DRIVER_LOG_ERR("input invalid parameter.");
return HDF_ERR_INVALID_PARAM;
}
if (regAttr.invert) {
regAttr.value = regAttr.max - regAttr.value;
}
model/audio/common/src/audio_platform_base.c
-1
View File
@@ -1225,7 +1225,6 @@ static int32_t PnpReportMsgConvert(const struct PnpReportMsg *pnpReportMsg, char
default:
AUDIO_DRIVER_LOG_ERR("Unknown message type!");
return HDF_FAILURE;
break;
}
return HDF_SUCCESS;
model/audio/core/src/audio_core.c
+2
View File
@@ -124,6 +124,7 @@ int32_t AudioRegisterAccessory(struct HdfDeviceObject *device,
ret = AudioSocRegisterDai(device, daiData);
if (ret != HDF_SUCCESS) {
OsalMutexDestroy(&accessory->mutex);
OsalMemFree(accessory);
ADM_LOG_ERR("Register accessory device fail ret=%d", ret);
return HDF_ERR_IO;
@@ -166,6 +167,7 @@ int32_t AudioRegisterCodec(struct HdfDeviceObject *device, struct CodecData *cod
ret = AudioSocRegisterDai(device, daiData);
if (ret != HDF_SUCCESS) {
OsalIoUnmap((void *)((uintptr_t)(codec->devData->virtualAddress)));
OsalMutexDestroy(&codec->mutex);
OsalMemFree(codec);
ADM_LOG_ERR("Register dai device fail ret=%d", ret);
return HDF_ERR_IO;
model/audio/sapm/src/audio_sapm.c
+2 -2
View File
@@ -849,6 +849,7 @@ int AudioSapmNewMuxControls(struct AudioSapmComponent *sapmComponent, struct Aud
}
if (sapmComponent->kcontrols == NULL) {
OsalMemFree(kctrl);
ADM_LOG_ERR("sapmComponent->kcontrols is NULL!");
return HDF_FAILURE;
}
@@ -1143,6 +1144,7 @@ int32_t AudioSapmNewControls(struct AudioCard *audioCard)
ret = AudioSapmPowerComponents(audioCard);
if (ret != HDF_SUCCESS) {
OsalMemFree(sapmComponent->kcontrols);
ADM_LOG_ERR("sapm power component fail!");
return HDF_FAILURE;
}
@@ -1344,8 +1346,6 @@ static bool AudioSapmCheckTime(void)
uint64_t diffTime = OsalGetSysTimeMs() - AudioSapmRefreshTime(false);
if (diffTime > SAPM_SLEEP_TIME) {
return true;
} else if (diffTime < 0) {
AudioSapmRefreshTime(true);
}
return false;
}