diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-08-01 15:26:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-08-01 15:26:40 +0200 |
| commit | a3b5d4715fd5a839857f8b7be78dff258a8d5a47 (patch) | |
| tree | b70d6f050f4831eaba82a60fb443659dc9dfca1c /sound/soc/qcom | |
| parent | 9769e44d41a1359b9000ff8458f0f2f66080ebf4 (diff) | |
| parent | 40d060b8158e26438398bf1132925f666e3b6480 (diff) | |
Merge tag 'asoc-v5.20-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: More updates for v5.20
More updates that came in since the last pull request I sent, a series
of driver specific changes:
- Support for AMD RPL, some Intel platforms and Mediatek MT8186.
Diffstat (limited to 'sound/soc/qcom')
| -rw-r--r-- | sound/soc/qcom/qdsp6/q6adm.c | 2 | ||||
| -rw-r--r-- | sound/soc/qcom/qdsp6/q6asm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/qcom/qdsp6/q6adm.c b/sound/soc/qcom/qdsp6/q6adm.c index 01f383888b62..1530e98df165 100644 --- a/sound/soc/qcom/qdsp6/q6adm.c +++ b/sound/soc/qcom/qdsp6/q6adm.c @@ -217,7 +217,7 @@ static struct q6copp *q6adm_alloc_copp(struct q6adm *adm, int port_idx) idx = find_first_zero_bit(&adm->copp_bitmap[port_idx], MAX_COPPS_PER_PORT); - if (idx > MAX_COPPS_PER_PORT) + if (idx >= MAX_COPPS_PER_PORT) return ERR_PTR(-EBUSY); c = kzalloc(sizeof(*c), GFP_ATOMIC); diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c index 9251d8548965..195780f75d05 100644 --- a/sound/soc/qcom/qdsp6/q6asm.c +++ b/sound/soc/qcom/qdsp6/q6asm.c @@ -513,7 +513,7 @@ int q6asm_map_memory_regions(unsigned int dir, struct audio_client *ac, return 0; } - buf = kzalloc(((sizeof(struct audio_buffer)) * periods), GFP_ATOMIC); + buf = kcalloc(periods, sizeof(*buf), GFP_ATOMIC); if (!buf) { spin_unlock_irqrestore(&ac->lock, flags); return -ENOMEM; |