Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933598AbcCGXqZ (ORCPT ); Mon, 7 Mar 2016 18:46:25 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:44112 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933630AbcCGXpo (ORCPT ); Mon, 7 Mar 2016 18:45:44 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 3.10 16/24] ALSA: hdspm: Fix wrong boolean ctl value accesses Date: Mon, 7 Mar 2016 15:45:18 -0800 Message-Id: <20160307234352.994923997@linuxfoundation.org> X-Mailer: git-send-email 2.7.2 In-Reply-To: <20160307234350.601613335@linuxfoundation.org> References: <20160307234350.601613335@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1511 Lines: 50 3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai commit 537e48136295c5860a92138c5ea3959b9542868b upstream. snd-hdspm driver accesses enum item values (int) instead of boolean values (long) wrongly for some ctl elements. This patch fixes them. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/rme9652/hdspm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c @@ -2091,7 +2091,7 @@ static int snd_hdspm_put_system_sample_r { struct hdspm *hdspm = snd_kcontrol_chip(kcontrol); - hdspm_set_dds_value(hdspm, ucontrol->value.enumerated.item[0]); + hdspm_set_dds_value(hdspm, ucontrol->value.integer.value[0]); return 0; } @@ -4199,7 +4199,7 @@ static int snd_hdspm_get_tco_word_term(s { struct hdspm *hdspm = snd_kcontrol_chip(kcontrol); - ucontrol->value.enumerated.item[0] = hdspm->tco->term; + ucontrol->value.integer.value[0] = hdspm->tco->term; return 0; } @@ -4210,8 +4210,8 @@ static int snd_hdspm_put_tco_word_term(s { struct hdspm *hdspm = snd_kcontrol_chip(kcontrol); - if (hdspm->tco->term != ucontrol->value.enumerated.item[0]) { - hdspm->tco->term = ucontrol->value.enumerated.item[0]; + if (hdspm->tco->term != ucontrol->value.integer.value[0]) { + hdspm->tco->term = ucontrol->value.integer.value[0]; hdspm_tco_write(hdspm);