From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 811C8155A4F; Tue, 23 Jan 2024 00:28:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969723; cv=none; b=msez9r7zkgeGP6sommJm0YBec8HubY5MupFRghBV/V4Sx9OSRpyValRtsWa4Xb4OxflAOHqG59YAVNJOLME2W6cxxkYPtuJjX+Cit4ytJTJt+qWdSpLvFcRdo8DA4lZDTaJl/VrTEINpLxIq78kA+r84qzWdlqaYlsdkC7PndTQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969723; c=relaxed/simple; bh=u9ljyTHM5Q6b+LIOVwyCEUQry0C9NdhtMJZV8T1INuc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XNzi9bDaY1RPmw/+XDsTkwwYw7ObKS3q22xF7ubXUzpsfNy3eo0X/IwNDmu/CpJ4yqn9B+x5c2jRVURozzQwcQTDJeZBLoGddkJeRa2CYNLji2CQoLGsp+iHLyEn2XmBDQXoMDnqb4NSHB5EugMhePfWkNMCX+os9OYKrfVsd4M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=z8SXY8oJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="z8SXY8oJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7927AC433C7; Tue, 23 Jan 2024 00:28:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705969723; bh=u9ljyTHM5Q6b+LIOVwyCEUQry0C9NdhtMJZV8T1INuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z8SXY8oJ/WqLux/dJ9JFgqhVI6EjKvcg5r37FDgMhThPQTXAxLMBmLplzNOhs0Wn0 9OH8PBxGwFbVrPkyJcVo5WSi/Guq0ogVMoT27DCNuKqGigA73WTSjhrVu9yqn4apTH zGW1ARxvvOHVqi/9qWUgOdvZ/zN2imvpcO5glIao= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Takashi Iwai Subject: [PATCH 6.7 418/641] ALSA: oxygen: Fix right channel of capture volume mixer Date: Mon, 22 Jan 2024 15:55:22 -0800 Message-ID: <20240122235831.067319298@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235818.091081209@linuxfoundation.org> References: <20240122235818.091081209@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai commit a03cfad512ac24a35184d7d87ec0d5489e1cb763 upstream. There was a typo in oxygen mixer code that didn't update the right channel value properly for the capture volume. Let's fix it. This trivial fix was originally reported on Bugzilla. Fixes: a3601560496d ("[ALSA] oxygen: add front panel controls") Cc: Link: https://bugzilla.kernel.org/show_bug.cgi?id=156561 Link: https://lore.kernel.org/r/20240112111023.6208-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/oxygen/oxygen_mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -718,7 +718,7 @@ static int ac97_fp_rec_volume_put(struct oldreg = oxygen_read_ac97(chip, 1, AC97_REC_GAIN); newreg = oldreg & ~0x0707; newreg = newreg | (value->value.integer.value[0] & 7); - newreg = newreg | ((value->value.integer.value[0] & 7) << 8); + newreg = newreg | ((value->value.integer.value[1] & 7) << 8); change = newreg != oldreg; if (change) oxygen_write_ac97(chip, 1, AC97_REC_GAIN, newreg);