Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3e64505 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: msm-pcm: Fix deadlock with error case in latency_ctl_get()"

parents 034f5e8b 2e4ebea9

asoc/msm-pcm-q6-v2.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1942,7 +1942,7 @@ static int msm_pcm_path_latency_ctl_get(struct snd_kcontrol *kcontrol, 
		if (rc) {

			pr_err("%s: get_path_delay failed, ret=%d\n",

				__func__, rc);

			mutex_lock(&pdata->lock);

			mutex_unlock(&pdata->lock);

			return -EINVAL;

		}

		ucontrol->value.integer.value[0] =