ASoC: amd: acp: Fix possible deadlock

[ Upstream commit 3ff53862c322aa7bb115d84348d5a641dc905d87 ]

On error path, function acp_i2s_set_tdm_slot returns without releasing
the lock and this could result in potential deadlocks in the future.

Error reported by sparse:
sound/soc/amd/acp/acp-i2s.c:95:12: error: context imbalance in
'acp_i2s_set_tdm_slot' - different lock contexts for basic block

Fixes: cd60dec899 ("ASoC: amd: acp: Refactor TDM slots selction based on acp revision id")
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20250127083422.20406-1-daniel.baluta@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

This commit is contained in:

Daniel Baluta

2025-01-27 10:34:22 +02:00

committed by

Greg Kroah-Hartman

parent 206d8e0242

commit e7f44edd44

1 changed files with 1 additions and 0 deletions

									
										sound/soc/amd/acp/acp-i2s.c
									
		+1
		
												View File
												
				@@ -181,6 +181,7 @@ static int acp_i2s_set_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, u32 rx_mas

							break;

						default:

							dev_err(dev, "Unknown chip revision %d\n", chip->acp_rev);

							spin_unlock_irq(&adata->acp_lock);

							return -EINVAL;

						}

					}