diff options
| author | Bard Liao | 2014-04-08 05:18:10 +0200 |
|---|---|---|
| committer | Mark Brown | 2014-04-14 18:23:39 +0200 |
| commit | 1a39019e939f620f39a1b914231ab6ba9013b208 (patch) | |
| tree | b620abc9b41893a422be05dc050215cec46f532e /include/sound/soc.h | |
| parent | ASoC: core: Fail codec probe if we fail to add controls (diff) | |
| download | kernel-qcow2-linux-1a39019e939f620f39a1b914231ab6ba9013b208.tar.gz kernel-qcow2-linux-1a39019e939f620f39a1b914231ab6ba9013b208.tar.xz kernel-qcow2-linux-1a39019e939f620f39a1b914231ab6ba9013b208.zip | |
ASoC: core: Allow snd_soc_update_bits use 32 bits register
Change reg's type from unsigned short to unsigned int. So that we can use
32 bits reg value in snd_soc_update_bits.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 0b83168d8ff4..4ed706bf11d1 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -469,12 +469,12 @@ static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count, #endif /* codec register bit access */ -int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg, +int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned int reg, unsigned int mask, unsigned int value); int snd_soc_update_bits_locked(struct snd_soc_codec *codec, - unsigned short reg, unsigned int mask, + unsigned int reg, unsigned int mask, unsigned int value); -int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg, +int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg, unsigned int mask, unsigned int value); int snd_soc_new_ac97_codec(struct snd_soc_codec *codec, |