From: Stephen Warren Date: Thu, 27 Jan 2011 21:54:05 +0000 (-0700) Subject: ASoC: Fix mask/val_mask confusion snd_soc_dapm_put_volsw() X-Git-Tag: v2.6.38-rc4~14^2^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9cf7049330cd44c8af43b0c5c7bef25a086c5b7;p=pandora-kernel.git ASoC: Fix mask/val_mask confusion snd_soc_dapm_put_volsw() snd_soc_dapm_put_volsw() has variables for both the unshifted and shifted mask for updates commit 97404f (ASoC: Do DAPM control updates in the middle of DAPM sequences) got confused between the two of these. Since there's no need to keep a copy of the unshifted mask fix this and simplify the code by using only one mask variable. [Completely rewrote the changelog to describe the issue -- broonie.] Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown --- Reading git-diff-tree failed