Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197550
b: refs/heads/master
c: 38e11cd
h: refs/heads/master
v: v3
  • Loading branch information
Henrique de Moraes Holschuh committed May 16, 2010
1 parent 69960b7 commit 8c6e553
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 69df49eb31e14fb01d9404497b751bfda9bfa012
refs/heads/master: 38e11cdec90f1dd7355db4aed8a1857258e99485
5 changes: 5 additions & 0 deletions trunk/drivers/platform/x86/thinkpad_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -6740,6 +6740,8 @@ static int volume_alsa_vol_get(struct snd_kcontrol *kcontrol,
static int volume_alsa_vol_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
tpacpi_disclose_usertask("ALSA", "set volume to %ld\n",
ucontrol->value.integer.value[0]);
return volume_alsa_set_volume(ucontrol->value.integer.value[0]);
}

Expand All @@ -6763,6 +6765,9 @@ static int volume_alsa_mute_get(struct snd_kcontrol *kcontrol,
static int volume_alsa_mute_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
tpacpi_disclose_usertask("ALSA", "%smute\n",
ucontrol->value.integer.value[0] ?
"un" : "");
return volume_alsa_set_mute(!ucontrol->value.integer.value[0]);
}

Expand Down

0 comments on commit 8c6e553

Please sign in to comment.