diff options
| author | Bard Liao | 2014-04-17 14:12:56 +0200 |
|---|---|---|
| committer | Mark Brown | 2014-04-18 16:53:22 +0200 |
| commit | 3477501274b79a904a4195b675bb74caa57d2e14 (patch) | |
| tree | ef3afb4b8023e3757ba0b91504fc3334d3d7f26a /sound/soc/soc-dapm.c | |
| parent | Linux 3.15-rc1 (diff) | |
| download | kernel-qcow2-linux-3477501274b79a904a4195b675bb74caa57d2e14.tar.gz kernel-qcow2-linux-3477501274b79a904a4195b675bb74caa57d2e14.tar.xz kernel-qcow2-linux-3477501274b79a904a4195b675bb74caa57d2e14.zip | |
ASoC: dapm: Allow update_bits use 32 bits reg
This patch change reg's type from unsigned short to int.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c8a780d0d057..f4ba7b40a6ab 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -426,7 +426,7 @@ static void soc_dapm_async_complete(struct snd_soc_dapm_context *dapm) } static int soc_widget_update_bits_locked(struct snd_soc_dapm_widget *w, - unsigned short reg, unsigned int mask, unsigned int value) + int reg, unsigned int mask, unsigned int value) { bool change; unsigned int old, new; |