summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-04-14 07:30:07 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-14 07:30:06 -0700
commit8ab454448f42f446fe41fa2c1487d6136b0e6b2b (patch)
tree47e9f59057e6bf1b0b1bcad5b4d104175bb4f065
parent6e1631fbaaf6c95d906d6cc4542d2c82da88a591 (diff)
parenta5bc5ed2f139cd768e180528949922c6a60840ca (diff)
Merge "ASoC: msm: qdsp6v2: Initialize variables before use"
-rw-r--r--drivers/soc/qcom/qdsp6v2/apr_tal_glink.c2
-rw-r--r--drivers/soc/qcom/qdsp6v2/audio_notifier.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/qcom/qdsp6v2/apr_tal_glink.c b/drivers/soc/qcom/qdsp6v2/apr_tal_glink.c
index 3a6d84140bc9..8a2be787b70e 100644
--- a/drivers/soc/qcom/qdsp6v2/apr_tal_glink.c
+++ b/drivers/soc/qcom/qdsp6v2/apr_tal_glink.c
@@ -114,7 +114,7 @@ int apr_tal_write(struct apr_svc_ch_dev *apr_ch, void *data,
{
int rc = 0, retries = 0;
void *pkt_data = NULL;
- struct apr_tx_buf *tx_buf;
+ struct apr_tx_buf *tx_buf = NULL;
struct apr_pkt_priv *pkt_priv_ptr = pkt_priv;
if (!apr_ch->handle || !pkt_priv)
diff --git a/drivers/soc/qcom/qdsp6v2/audio_notifier.c b/drivers/soc/qcom/qdsp6v2/audio_notifier.c
index a59b436234c7..b46cd2067441 100644
--- a/drivers/soc/qcom/qdsp6v2/audio_notifier.c
+++ b/drivers/soc/qcom/qdsp6v2/audio_notifier.c
@@ -510,7 +510,7 @@ int audio_notifier_deregister(char *client_name)
int ret = 0;
int ret2;
struct list_head *ptr, *next;
- struct client_data *client_data;
+ struct client_data *client_data = NULL;
if (client_name == NULL) {
pr_err("%s: client_name is NULL\n", __func__);