lkml.org 
[lkml]   [2016]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 094/142] ALSA: hdspm: Fix wrong boolean ctl value accesses
    Date
    3.16.7-ckt26 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Takashi Iwai <tiwai@suse.de>

    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 <tiwai@suse.de>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    sound/pci/rme9652/hdspm.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
    index f292bed4424d..004fd3260048 100644
    --- a/sound/pci/rme9652/hdspm.c
    +++ b/sound/pci/rme9652/hdspm.c
    @@ -2266,7 +2266,7 @@ static int snd_hdspm_put_system_sample_rate(struct snd_kcontrol *kcontrol,
    {
    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;
    }

    @@ -4465,7 +4465,7 @@ static int snd_hdspm_get_tco_word_term(struct snd_kcontrol *kcontrol,
    {
    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;
    }
    @@ -4476,8 +4476,8 @@ static int snd_hdspm_put_tco_word_term(struct snd_kcontrol *kcontrol,
    {
    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);

    \
     
     \ /
      Last update: 2016-03-22 12:21    [W:4.081 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site