Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp238809ybi; Wed, 29 May 2019 20:24:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqzvuAVBTGahn9v0Veth3ilY/Z6x07G5EL3BDzmoBWItB+uUGc2rXxh3ls/4b6vtpH34E7Kp X-Received: by 2002:aa7:9a95:: with SMTP id w21mr1458031pfi.248.1559186695997; Wed, 29 May 2019 20:24:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559186695; cv=none; d=google.com; s=arc-20160816; b=uSariXVOTIbtDKuKyWXBzYlXe0a2YJfazrzjaYWjbyiRtatl73RJ0rHki6MOkPRD89 nv+o6OCj71+E008cnKcJm5c846wvXkPjgso7qNB9JHIo+ZpZBzoajcwEEOw/O0DbUX7X gtzfovODeQcNKIv/UsJwpywCLlWK0PNw+oockvUCcAT1dljhFEf+MR5gBH7qPGZnt5c+ nEIPVs/JbiF60CvAlADE6Y/EB9tGNGNeSumRoSFAzOroR9nqvRr6p9yhJlmfWJ8mQA0E Bq7/vCAG1JL5VC3UFbVhz588Dd0IXdBwk5LajBGCl4AJLpEmyNmPLA1Y/bewPHf2Ktbz JVrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7m4PbdXVo5TByOoYCaMb0X7zxR6JCIsWzygCj5Kdjf0=; b=EScgrsZT2e0VfxWMBNNZoAJ7i30KlzF8GKR0vNjvmReq0AEcymDYtZN8yYdEGOZlgZ oi4Lc4IusOfZgQKGZL7ryT21QdZ22DYUfsvG1wqRde0/oqNRc9dOY2kIM5lnM1AOsFNO pWExiBvbT2zMIqyW3KUDtmJSaLWgSiJy93jAjW8ET3Xu7ncttmiW0iNMGEJV2ln0c//U duDMl//+X4P3vIB8K8U6/zs3HcSIc+eM6+blXG11PjGxVf4WbDzEUt1Pe2PrP364aiR3 rum+fsPItsPoUXvFpJuxt10D5Ak8BuDvHighXArivGj0JhuDWBRu/J75mH4Dxqd2hRRg ob0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RBwsG+2F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a2si865293pls.118.2019.05.29.20.24.40; Wed, 29 May 2019 20:24:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RBwsG+2F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732648AbfE3DVv (ORCPT + 99 others); Wed, 29 May 2019 23:21:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:42908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727970AbfE3DQb (ORCPT ); Wed, 29 May 2019 23:16:31 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3B1F624598; Thu, 30 May 2019 03:16:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186191; bh=rGYkPEUNxSrzRwyQUAHdYE0cJaWGG91Py/JCKHHZwno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RBwsG+2FAS8htd93IP7sdavXt/0NKfsbnxlc7FLKyutvDinAdenNsU02Zyr3fg0jB ZpbbHRJ81EoR2pzv8v/WmkybN84Ww1U4m61EyL0DQ1f1KPwD1oa4afAN4LJ4Zex25u o2/YtQVnTpZ2xvwqb5fgL/Y18Ouz5KbM7qn8NBWc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerome Brunet , Mark Brown , Sasha Levin Subject: [PATCH 4.19 061/276] ASoC: hdmi-codec: unlock the device on startup errors Date: Wed, 29 May 2019 20:03:39 -0700 Message-Id: <20190530030529.529479407@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030523.133519668@linuxfoundation.org> References: <20190530030523.133519668@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 30180e8436046344b12813dc954b2e01dfdcd22d ] If the hdmi codec startup fails, it should clear the current_substream pointer to free the device. This is properly done for the audio_startup() callback but for snd_pcm_hw_constraint_eld(). Make sure the pointer cleared if an error is reported. Signed-off-by: Jerome Brunet Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/hdmi-codec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index d5f73c8372817..7994e8ddc7d21 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -439,8 +439,12 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, if (!ret) { ret = snd_pcm_hw_constraint_eld(substream->runtime, hcp->eld); - if (ret) + if (ret) { + mutex_lock(&hcp->current_stream_lock); + hcp->current_stream = NULL; + mutex_unlock(&hcp->current_stream_lock); return ret; + } } /* Select chmap supported */ hdmi_codec_eld_chmap(hcp); -- 2.20.1