From 6d3902ba7784d824417bf9c176dcd2c9f6a660b4 Mon Sep 17 00:00:00 2001 From: vb6174 Date: Sat, 21 Aug 2021 09:39:06 +0000 Subject: [PATCH 1/4] modify redundant compare Signed-off-by: vb6174 --- model/audio/sapm/src/audio_sapm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/model/audio/sapm/src/audio_sapm.c b/model/audio/sapm/src/audio_sapm.c index 1b8800b81..652f6365c 100755 --- a/model/audio/sapm/src/audio_sapm.c +++ b/model/audio/sapm/src/audio_sapm.c @@ -598,8 +598,7 @@ static int32_t AudioSapmAddRoute(struct AudioCard *audioCard, const struct Audio struct AudioSapmComponent *sapmComponent = NULL; int32_t ret; - if ((audioCard == NULL || &audioCard->components == NULL) || - (route == NULL || route->source == NULL || route->sink == NULL)) { + if ((audioCard == NULL || (route == NULL || route->source == NULL || route->sink == NULL)) { ADM_LOG_ERR("input params check error: audioCard=%p, route=%p.", audioCard, route); return HDF_FAILURE; } -- Gitee From 4184ddf8e79bb46f87abeb50cfd945b2bebcfaf0 Mon Sep 17 00:00:00 2001 From: vb6174 Date: Sat, 21 Aug 2021 10:11:15 +0000 Subject: [PATCH 2/4] update model/audio/sapm/src/audio_sapm.c. --- model/audio/sapm/src/audio_sapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/audio/sapm/src/audio_sapm.c b/model/audio/sapm/src/audio_sapm.c index 652f6365c..b3d60c017 100755 --- a/model/audio/sapm/src/audio_sapm.c +++ b/model/audio/sapm/src/audio_sapm.c @@ -598,7 +598,7 @@ static int32_t AudioSapmAddRoute(struct AudioCard *audioCard, const struct Audio struct AudioSapmComponent *sapmComponent = NULL; int32_t ret; - if ((audioCard == NULL || (route == NULL || route->source == NULL || route->sink == NULL)) { + if ((audioCard == NULL) || (route == NULL || route->source == NULL || route->sink == NULL)) { ADM_LOG_ERR("input params check error: audioCard=%p, route=%p.", audioCard, route); return HDF_FAILURE; } -- Gitee From dda5698e1880be3cf21af4a7752173d8283ae3aa Mon Sep 17 00:00:00 2001 From: vb6174 Date: Sat, 21 Aug 2021 11:29:40 +0000 Subject: [PATCH 3/4] sign off Signed-off-by: vb6174 --- model/audio/sapm/src/audio_sapm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/model/audio/sapm/src/audio_sapm.c b/model/audio/sapm/src/audio_sapm.c index 652f6365c..e7a43766a 100755 --- a/model/audio/sapm/src/audio_sapm.c +++ b/model/audio/sapm/src/audio_sapm.c @@ -622,7 +622,6 @@ static int32_t AudioSapmAddRoute(struct AudioCard *audioCard, const struct Audio ADM_LOG_ERR("find component fail!"); return HDF_FAILURE; } - path = (struct AudioSapmpath *)OsalMemCalloc(sizeof(struct AudioSapmpath)); if (path == NULL) { ADM_LOG_ERR("malloc path fail!"); -- Gitee From ef6f2950177768424e0ab1f5da6e1a88d55dd1f6 Mon Sep 17 00:00:00 2001 From: vb6174 Date: Sat, 21 Aug 2021 11:31:04 +0000 Subject: [PATCH 4/4] sign off Signed-off-by: vb6174 --- model/audio/sapm/src/audio_sapm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/model/audio/sapm/src/audio_sapm.c b/model/audio/sapm/src/audio_sapm.c index 31047994d..b3d60c017 100755 --- a/model/audio/sapm/src/audio_sapm.c +++ b/model/audio/sapm/src/audio_sapm.c @@ -622,6 +622,7 @@ static int32_t AudioSapmAddRoute(struct AudioCard *audioCard, const struct Audio ADM_LOG_ERR("find component fail!"); return HDF_FAILURE; } + path = (struct AudioSapmpath *)OsalMemCalloc(sizeof(struct AudioSapmpath)); if (path == NULL) { ADM_LOG_ERR("malloc path fail!"); -- Gitee