The mute key on SL410/SL510 only works when the alsa volume mixer
is not enabled. This patch makes the alsa volume mixer disabled
on the matched SL410/SL510 EC versions.
Signed-off-by: Keng-Yu Lin <kengyu@xxxxxxxxxxxxx>
---
drivers/platform/x86/thinkpad_acpi.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 7bd829f..19f0e3d 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -6853,6 +6853,7 @@ err_exit:
#define TPACPI_VOL_Q_MUTEONLY 0x0001 /* Mute-only control available */
#define TPACPI_VOL_Q_LEVEL 0x0002 /* Volume control available */
+#define TPACPI_VOL_Q_BLACKLIST 0x0004 /* Blacklist volume control */
static const struct tpacpi_quirk volume_quirk_table[] __initconst = {
/* Whitelist volume level on all IBM by default */
@@ -6869,6 +6870,7 @@ static const struct tpacpi_quirk volume_quirk_table[] __initconst = {
TPACPI_QEC_LNV('7', 'J', TPACPI_VOL_Q_LEVEL), /* X60t */
TPACPI_QEC_LNV('7', '7', TPACPI_VOL_Q_LEVEL), /* Z60 */
TPACPI_QEC_LNV('7', 'F', TPACPI_VOL_Q_LEVEL), /* Z61 */
+ TPACPI_QEC_LNV('6', 'J', TPACPI_VOL_Q_BLACKLIST), /* SL410/SL510 */
/* Whitelist mute-only on all Lenovo by default */
{ .vendor = PCI_VENDOR_ID_LENOVO,
@@ -6903,6 +6905,16 @@ static int __init volume_init(struct ibm_init_struct *iibm)
if (volume_capabilities >= TPACPI_VOL_CAP_MAX)
return -EINVAL;
+ quirks = tpacpi_check_quirks(volume_quirk_table,
+ ARRAY_SIZE(volume_quirk_table));
+
+ if (quirks & TPACPI_VOL_Q_BLACKLIST) {
+ dbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_MIXER,
+ "ALSA mixer blacklisted for this model, "
+ "not loading volume subdriver...\n");
+ return 1;
+ }
+
/*
* The ALSA mixer is our primary interface.
* When disabled, don't install the subdriver at all
@@ -6914,9 +6926,6 @@ static int __init volume_init(struct ibm_init_struct *iibm)
return 1;
}
- quirks = tpacpi_check_quirks(volume_quirk_table,
- ARRAY_SIZE(volume_quirk_table));
-
switch (volume_capabilities) {
case TPACPI_VOL_CAP_AUTO:
if (quirks & TPACPI_VOL_Q_MUTEONLY)
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
