From nobody Thu Dec 18 18:49:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F558C77B6E for ; Fri, 14 Apr 2023 15:27:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231404AbjDNP1Y (ORCPT ); Fri, 14 Apr 2023 11:27:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231274AbjDNP1K (ORCPT ); Fri, 14 Apr 2023 11:27:10 -0400 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BE95FF0D for ; Fri, 14 Apr 2023 08:26:34 -0700 (PDT) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33EDVEGo030487; Fri, 14 Apr 2023 10:26:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=I3l9dEf9Pxrt0iwsB+1r4Bv1ieTEMmtO3O+2uHhuyLc=; b=H7LglqaoEwfzYkPgtASdJxtxvolzG99MPScVDQjlRdAQ/DIwrHLNwiBfOMLt06Ac8ZVF g/w5FMFls8dIZD6N0QYUtVgwXDAGVV1mkZXQ02BhThiUvHXeczPloFrTAmMEFWp8pQ7p ovuA9EApLPzTKianpN0jZ9GT0GbtnWsJg946R0A8AqR7/Liyg06MFq2i/nsk6DVAP1GT hyHU5uAFSDlg0tvXpRp2xnpxwmoc4DLopQxlFve5HNLXEI9dGdYfszbomdYw0pfVB6rl 9J90AdDUGuCJJExfGtayzfnCymxMSZAjtUqWLZP6npzi7WEK9x0MdX9OdYzFEfygUUXl PA== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3pu5p3skxn-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Apr 2023 10:26:02 -0500 Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Fri, 14 Apr 2023 10:25:59 -0500 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Fri, 14 Apr 2023 10:25:59 -0500 Received: from sbinding-cirrus-dsktp2.ad.cirrus.com (unknown [198.90.238.135]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 5782211C6; Fri, 14 Apr 2023 15:25:59 +0000 (UTC) From: Stefan Binding To: Mark Brown , Jaroslav Kysela , Takashi Iwai CC: , , , Stefan Binding Subject: [PATCH v1 1/4] ALSA: hda: cs35l41: Clean up Firmware Load Controls Date: Fri, 14 Apr 2023 16:25:49 +0100 Message-ID: <20230414152552.574502-2-sbinding@opensource.cirrus.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230414152552.574502-1-sbinding@opensource.cirrus.com> References: <20230414152552.574502-1-sbinding@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: zUZitPZy_kxOGxncML1uE6UtVdccA4Kb X-Proofpoint-GUID: zUZitPZy_kxOGxncML1uE6UtVdccA4Kb X-Proofpoint-Spam-Reason: safe Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Ensure Firmware Load control and Firmware Type control returns 1 when the value changes. Remove fw_mutex from firmware load control put, since it is unnecessary, and prevents any possibility of mutex inversion. Signed-off-by: Stefan Binding --- sound/pci/hda/cs35l41_hda.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index b5210abb5141f..d100189e15b83 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -835,34 +835,26 @@ static int cs35l41_fw_load_ctl_put(struct snd_kcontro= l *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct cs35l41_hda *cs35l41 =3D snd_kcontrol_chip(kcontrol); - unsigned int ret =3D 0; - - mutex_lock(&cs35l41->fw_mutex); =20 if (cs35l41->request_fw_load =3D=3D ucontrol->value.integer.value[0]) - goto err; + return 0; =20 if (cs35l41->fw_request_ongoing) { dev_dbg(cs35l41->dev, "Existing request not complete\n"); - ret =3D -EBUSY; - goto err; + return -EBUSY; } =20 /* Check if playback is ongoing when initial request is made */ if (cs35l41->playback_started) { dev_err(cs35l41->dev, "Cannot Load/Unload firmware during Playback\n"); - ret =3D -EBUSY; - goto err; + return -EBUSY; } =20 cs35l41->fw_request_ongoing =3D true; cs35l41->request_fw_load =3D ucontrol->value.integer.value[0]; schedule_work(&cs35l41->fw_load_work); =20 -err: - mutex_unlock(&cs35l41->fw_mutex); - - return ret; + return 1; } =20 static int cs35l41_fw_type_ctl_get(struct snd_kcontrol *kcontrol, @@ -881,8 +873,12 @@ static int cs35l41_fw_type_ctl_put(struct snd_kcontrol= *kcontrol, struct cs35l41_hda *cs35l41 =3D snd_kcontrol_chip(kcontrol); =20 if (ucontrol->value.enumerated.item[0] < HDA_CS_DSP_NUM_FW) { - cs35l41->firmware_type =3D ucontrol->value.enumerated.item[0]; - return 0; + if (cs35l41->firmware_type !=3D ucontrol->value.enumerated.item[0]) { + cs35l41->firmware_type =3D ucontrol->value.enumerated.item[0]; + return 1; + } else { + return 0; + } } =20 return -EINVAL; --=20 2.34.1