diff --git a/[refs] b/[refs] index b86bbc6e0179..ccfb5f390eef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e71fa370428aa80e3acc3a49f8df1e76e7719347 +refs/heads/master: f1df5aec68946e427eb4884c4d80e3259361478c diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index 254dd1c6914d..26f17323ef19 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -2433,14 +2433,12 @@ int snd_soc_put_volsw_2r_sx(struct snd_kcontrol *kcontrol, if (oval != val) { ret = snd_soc_write(codec, mc->reg, val); if (ret < 0) - return 0; - ret = 1; + return ret; } if (ovalr != valr) { ret = snd_soc_write(codec, mc->rreg, valr); if (ret < 0) - return 0; - ret = 1; + return ret; } return 0;