diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-28 15:16:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-28 15:16:53 +0100 |
| commit | f81325a05e9317f09a2e4ec57a52e4e49eb42b54 (patch) | |
| tree | a5a91589c9ef8e212f2899f1462cfb5c3f0130ef /sound/pci/mixart/mixart_core.c | |
| parent | ASoC: meson: axg-tdm-interface: fix loopback (diff) | |
| parent | Linux 5.11-rc1 (diff) | |
| download | linux-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.tar.xz linux-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.zip | |
Merge tag 'v5.11-rc1' into asoc-5.11
Linux 5.11-rc1
Diffstat (limited to 'sound/pci/mixart/mixart_core.c')
| -rw-r--r-- | sound/pci/mixart/mixart_core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c index 0bdd33b0af65..fb8895af0363 100644 --- a/sound/pci/mixart/mixart_core.c +++ b/sound/pci/mixart/mixart_core.c @@ -70,7 +70,6 @@ static int get_msg(struct mixart_mgr *mgr, struct mixart_msg *resp, unsigned int i; #endif - mutex_lock(&mgr->msg_lock); err = 0; /* copy message descriptor from miXart to driver */ @@ -119,8 +118,6 @@ static int get_msg(struct mixart_mgr *mgr, struct mixart_msg *resp, writel_be(headptr, MIXART_MEM(mgr, MSG_OUTBOUND_FREE_HEAD)); _clean_exit: - mutex_unlock(&mgr->msg_lock); - return err; } @@ -258,7 +255,9 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int resp.data = resp_data; resp.size = max_resp_size; + mutex_lock(&mgr->msg_lock); err = get_msg(mgr, &resp, msg_frame); + mutex_unlock(&mgr->msg_lock); if( request->message_id != resp.message_id ) dev_err(&mgr->pci->dev, "RESPONSE ERROR!\n"); |