Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus (4351ac5b) · Commits · e / devices / android_kernel_fairphone_FP5

sound/soc/codecs/tlv320aic3x.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -187,14 +187,14 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,

		break;
		}
		}

		mutex_unlock(&widget->codec->mutex);

		if (found)
		snd_soc_dapm_sync(widget->dapm);
		}

		ret = snd_soc_update_bits(widget->codec, reg, val_mask, val);

		mutex_unlock(&widget->codec->mutex);
		ret = snd_soc_update_bits_locked(widget->codec, reg, val_mask, val);
		return ret;
		}