Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
This commit is contained in:
commit
4351ac5b9f
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue