diff --git a/[refs] b/[refs] index 7ba972c8b329..9f6bc394ecb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d99f2436d0d1c7741d6dfd9d27b5376cdbbca40 +refs/heads/master: 27f1d75921e7273e484cc2fab132d9fcbe9f845d diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index 7b1a4fd932d7..a6922bc96184 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -2586,7 +2586,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, int max = mc->max; int min = mc->min; int mask = (1 << (fls(min + max) - 1)) - 1; - int err; + int err = 0; unsigned short val, val_mask, val2 = 0; val_mask = mask << shift;