lkml.org 
[lkml]   [2010]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] thinkpad-acpi: fix return value of volume callbacks
    On Mon, 22 Feb 2010, Clemens Ladisch wrote:
    > Fix up the volume status setting functions to return a non-zero value if
    > the control value has changed, so that the ALSA framework can correctly
    > generate control change notifications.

    Please explain...

    >
    > Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    >
    > --- linux/drivers/platform/x86/thinkpad_acpi.c
    > +++ linux/drivers/platform/x86/thinkpad_acpi.c
    > @@ -6537,8 +6537,11 @@ static int volume_set_mute_ec(const bool
    > n = (mute) ? s | TP_EC_AUDIO_MUTESW_MSK :
    > s & ~TP_EC_AUDIO_MUTESW_MSK;
    >
    > - if (n != s)
    > + if (n != s) {
    > rc = volume_set_status_ec(n);
    > + if (!rc)
    > + rc = 1;
    > + }
    >
    > unlock:
    > mutex_unlock(&volume_mutex);
    > @@ -6569,8 +6572,11 @@ static int volume_set_volume_ec(const u8
    >
    > n = (s & ~TP_EC_AUDIO_LVL_MSK) | vol;
    >
    > - if (n != s)
    > + if (n != s) {
    > rc = volume_set_status_ec(n);
    > + if (!rc)
    > + rc = 1;
    > + }
    >
    > unlock:
    > mutex_unlock(&volume_mutex);
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    > Please read the FAQ at http://www.tux.org/lkml/

    --
    "One disk to rule them all, One disk to find them. One disk to bring
    them all and in the darkness grind them. In the Land of Redmond
    where the shadows lie." -- The Silicon Valley Tarot
    Henrique Holschuh


    \
     
     \ /
      Last update: 2010-02-23 04:15    [W:0.022 / U:30.536 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site