[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B825228.8050405@ladisch.de>
Date: Mon, 22 Feb 2010 10:45:12 +0100
From: Clemens Ladisch <clemens@...isch.de>
To: Henrique de Moraes Holschuh <hmh@....eng.br>,
ibm-acpi-devel@...ts.sourceforge.net, linux-kernel@...r.kernel.org
Subject: [PATCH] thinkpad-acpi: fix return value of volume callbacks
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.
Signed-off-by: Clemens Ladisch <clemens@...isch.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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists