From mboxrd@z Thu Jan 1 00:00:00 1970 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 ABDF3C64ED6 for ; Wed, 1 Mar 2023 18:08:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229809AbjCASIv (ORCPT ); Wed, 1 Mar 2023 13:08:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229520AbjCASIt (ORCPT ); Wed, 1 Mar 2023 13:08:49 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 210332D75 for ; Wed, 1 Mar 2023 10:08:49 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B6FE76140D for ; Wed, 1 Mar 2023 18:08:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8A73C433EF; Wed, 1 Mar 2023 18:08:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1677694128; bh=QPcNFvGHkkNV4wKWo7XyJcP3fiArJMHCz3/xNZTjLzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BQ0ujDyBeOIlnnNhLzOWUDeyhWloGXx7VctuO4pcVdtEwENd7ksTq6SXvIZRWiHYh Qbf06J2xsum8A/lKZXTweD41mrbHIopMa4Uf4YcfftGPi8UVo0cCKoEATh0KNZ3Mgw M2/u8qa+blKQ3y+IEa5LrwPgB9jLrAI5U+BO5k/E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vitaly Rodionov , Stefan Binding , Takashi Iwai , Richard Fitzgerald Subject: [PATCH 6.2 01/16] ALSA: hda: cs35l41: Correct error condition handling Date: Wed, 1 Mar 2023 19:07:37 +0100 Message-Id: <20230301180653.314613545@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301180653.263532453@linuxfoundation.org> References: <20230301180653.263532453@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vitaly Rodionov commit 943f4e64ee177cf44d7f2c235281fcda7c32bb28 upstream. Function cs_dsp_coeff_write_ctrl() can return 3 possible values: 0 - no change, 1 - value has changed and -1 - error, so positive value is not an error. Fixes: 7406bdbc4fb8 ("ASoC: wm_adsp: Return whether changed when writing controls") Signed-off-by: Vitaly Rodionov Signed-off-by: Stefan Binding Link: https://lore.kernel.org/r/20230213145008.1215849-2-sbinding@opensource.cirrus.com Signed-off-by: Takashi Iwai Cc: Richard Fitzgerald Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/hda_cs_dsp_ctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/sound/pci/hda/hda_cs_dsp_ctl.c +++ b/sound/pci/hda/hda_cs_dsp_ctl.c @@ -218,10 +218,10 @@ int hda_cs_dsp_write_ctl(struct cs_dsp * cs_ctl = cs_dsp_get_ctl(dsp, name, type, alg); ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, buf, len); mutex_unlock(&dsp->pwr_lock); - if (ret) + if (ret < 0) return ret; - if (cs_ctl->flags & WMFW_CTL_FLAG_SYS) + if (ret == 0 || (cs_ctl->flags & WMFW_CTL_FLAG_SYS)) return 0; ctl = cs_ctl->priv;