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 52C4822E9F7; Thu, 12 Dec 2024 16:29: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=1734020984; cv=none; b=M5yz8YjrBFciOgVPEsrrJGORru0/4J44EH2i2XsmN+ema3TXnphpMJTyaPA2H9Jt75mB63kdXF7hoRhe6ZhQB0MsQH345E8pp+djugaTNeNsFLEquOfoeZxDgzShtDeHcf4js7DfMu+EKw2VUmvyLutDzMu9hkpmsC5+KaIuJRo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734020984; c=relaxed/simple; bh=7sicUKyAIBCmoPfoP3zkVTNkkYEBfLHDbb0et+AoGLs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S2AjZnW3WCffKDXUFbjQ7zOruS892NZtZtHanCAsB6tpMUJT2lSHppGvchtkngKfabV7UtF5yB6zjiAzb74xiL309Qu06XFKVoISnVZvGF2wY1F9Eh6vuihsyED+F/2qyzIrcfWzwAYxLinhUsdUX5h2lQ/slOKI6m2aVsctMhQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZzT0SMpk; 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="ZzT0SMpk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38237C4CED0; Thu, 12 Dec 2024 16:29:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734020983; bh=7sicUKyAIBCmoPfoP3zkVTNkkYEBfLHDbb0et+AoGLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZzT0SMpkxM+AUsmx+ud/1rWuD76Edegn6uBvXNzeocRxHzXOuqzHFrdBrlLV0GkY5 ffU6Iwvo6UqNQjbbkShcDipeChdC5tcsUEs2YUpD1XckasGw8ZGcXPS3tcSXusuR04 T0n6B/gfLSSeR00HGWW/ffniUg1R1ZPh63YgB8I0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marie Ramlow , Takashi Iwai Subject: [PATCH 6.1 613/772] ALSA: usb-audio: add mixer mapping for Corsair HS80 Date: Thu, 12 Dec 2024 15:59:18 +0100 Message-ID: <20241212144415.263592009@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marie Ramlow commit a7de2b873f3dbcda02d504536f1ec6dc50e3f6c4 upstream. The Corsair HS80 RGB Wireless is a USB headset with a mic and a sidetone feature. It has the same quirk as the Virtuoso series. This labels the mixers appropriately, so applications don't move the sidetone volume when they actually intend to move the main headset volume. Signed-off-by: Marie Ramlow cc: Link: https://patch.msgid.link/20241130165240.17838-1-me@nycode.dev Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/mixer_maps.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -621,6 +621,16 @@ static const struct usbmix_ctl_map usbmi .id = USB_ID(0x1b1c, 0x0a42), .map = corsair_virtuoso_map, }, + { + /* Corsair HS80 RGB Wireless (wired mode) */ + .id = USB_ID(0x1b1c, 0x0a6a), + .map = corsair_virtuoso_map, + }, + { + /* Corsair HS80 RGB Wireless (wireless mode) */ + .id = USB_ID(0x1b1c, 0x0a6b), + .map = corsair_virtuoso_map, + }, { /* Gigabyte TRX40 Aorus Master (rear panel + front mic) */ .id = USB_ID(0x0414, 0xa001), .map = aorus_master_alc1220vb_map,