Commit 4351ac5b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus

parents 97a47ce9 2894770e

sound/soc/codecs/tlv320aic3x.c

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




			break;

			break;

		}

		}

	}



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





	if (found)

	if (found)

		snd_soc_dapm_sync(widget->dapm);

		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;

	return ret;

}

}