diff options
author | Mark Brown <broonie@kernel.org> | 2021-08-30 12:30:33 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-08-30 12:30:33 +0100 |
commit | 38b7673000949ca784fcb8a9feb70d2a802befa6 (patch) | |
tree | a5d23c2784c2825c680b840ff8eb0653bdb5625e /sound/soc/qcom/qdsp6/q6adm.c | |
parent | Merge remote-tracking branch 'asoc/for-5.14' into asoc-linus (diff) | |
parent | ASoC: Revert PCM trigger changes (diff) | |
download | wireguard-linux-38b7673000949ca784fcb8a9feb70d2a802befa6.tar.xz wireguard-linux-38b7673000949ca784fcb8a9feb70d2a802befa6.zip |
Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus
Diffstat (limited to 'sound/soc/qcom/qdsp6/q6adm.c')
-rw-r--r-- | sound/soc/qcom/qdsp6/q6adm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/qcom/qdsp6/q6adm.c b/sound/soc/qcom/qdsp6/q6adm.c index 1855b805eba2..3d831b635524 100644 --- a/sound/soc/qcom/qdsp6/q6adm.c +++ b/sound/soc/qcom/qdsp6/q6adm.c @@ -465,7 +465,7 @@ int q6adm_matrix_map(struct device *dev, int path, struct apr_pkt *pkt; uint16_t *copps_list; int pkt_size, ret, i, copp_idx; - void *matrix_map = NULL; + void *matrix_map; struct q6copp *copp; /* Assumes port_ids have already been validated during adm_open */ |