summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-08 15:15:46 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-04 12:35:20 +0100
commit41b5b3bd5b7c9dd4ab4e0583d54d81b7f7d33d1f (patch)
tree09c3437dd3f4bd620b81ab98a537505650d7dea3 /include/sound
parent67d45090e6154d401e50c3e0f4a2844cfea404c4 (diff)
downloadlinux-3.10-41b5b3bd5b7c9dd4ab4e0583d54d81b7f7d33d1f.tar.gz
linux-3.10-41b5b3bd5b7c9dd4ab4e0583d54d81b7f7d33d1f.tar.bz2
linux-3.10-41b5b3bd5b7c9dd4ab4e0583d54d81b7f7d33d1f.zip
ASoC: dapm: Allow DAPM registers to be 31 bit
Supports larger register maps, not using unsigned ints for the full 32 bit as we rely on checking for negative registers. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-dapm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index a53e231044a..01e7ad1f3f9 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -487,7 +487,7 @@ struct snd_soc_dapm_widget {
struct regulator *regulator; /* attached regulator */
/* dapm control */
- short reg; /* negative reg = no direct dapm */
+ int reg; /* negative reg = no direct dapm */
unsigned char shift; /* bits to shift */
unsigned int saved_value; /* widget saved value */
unsigned int value; /* widget current value */