From: Bard Liao Date: Thu, 17 Apr 2014 12:12:56 +0000 (+0800) Subject: ASoC: dapm: Allow update_bits use 32 bits reg X-Git-Tag: firefly_0821_release~176^2~3750^2~24^2~27^2~8 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3477501274b79a904a4195b675bb74caa57d2e14;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Mark Brown --- 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;