From patchwork Mon Aug 10 15:20:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 266613 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FC74C433E0 for ; Mon, 10 Aug 2020 15:40:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1DF2020825 for ; Mon, 10 Aug 2020 15:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597074059; bh=y27Zhu8F9W1JK886ANmln+6mHUPnci9sProeWuTqNfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V0exLrdISg4FpCh+9kofxhfuGRrlLq2IIU1T5zomjszxTwY77Mgfr75cwePEnS+0F jF/wjGRFhcXg5Ko42001+OVoxt01tSecdLeFT5HCuvGWFIh9y5WDXfZPPe+3Tdh3Mk 5a9VjKCTsaOLjEmudtMbNYEOPpnAmHWPu6sw0Tr8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728042AbgHJPkw (ORCPT ); Mon, 10 Aug 2020 11:40:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:55598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728080AbgHJPXn (ORCPT ); Mon, 10 Aug 2020 11:23:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 33DE622D04; Mon, 10 Aug 2020 15:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073022; bh=y27Zhu8F9W1JK886ANmln+6mHUPnci9sProeWuTqNfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K7FVyPQZGe7+xStSlOYto07zY+aCgC7edgdZ6QCilJhUk895GYn1S6LXkTx4dk75n aVPaRz4rNuJ+QdnyF1l6Pr5JVFt2ogy321S+3+ynFflkSN46cw2BbGmMComYvSW1o8 4tmLYUMiZTmU/jFm3lnFuWsY6Q25NGE+gdcU4j4Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Connor McAdams , Takashi Iwai Subject: [PATCH 5.7 09/79] ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value. Date: Mon, 10 Aug 2020 17:20:28 +0200 Message-Id: <20200810151812.590690226@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200810151812.114485777@linuxfoundation.org> References: <20200810151812.114485777@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Connor McAdams commit a00dc409de455b64e6cb2f6d40cdb8237cdb2e83 upstream. When the ZxR headphone gain control was added, the ca0132_switch_get function was not updated, which meant that the changes to the control state were not saved when entering/exiting alsamixer. Signed-off-by: Connor McAdams Cc: Link: https://lore.kernel.org/r/20200803002928.8638-1-conmanx360@gmail.com Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_ca0132.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -5749,6 +5749,11 @@ static int ca0132_switch_get(struct snd_ return 0; } + if (nid == ZXR_HEADPHONE_GAIN) { + *valp = spec->zxr_gain_set; + return 0; + } + return 0; }