mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 21:59:12 -04:00
Merge remote-tracking branch 'asoc/fix/component' into asoc-linus
This commit is contained in:
commit
b12d1e4fbb
1 changed files with 2 additions and 5 deletions
|
|
@ -88,19 +88,16 @@ static int snd_soc_component_update_bits_legacy(
|
|||
unsigned int old, new;
|
||||
int ret;
|
||||
|
||||
if (!component->read || !component->write)
|
||||
return -EIO;
|
||||
|
||||
mutex_lock(&component->io_mutex);
|
||||
|
||||
ret = component->read(component, reg, &old);
|
||||
ret = snd_soc_component_read(component, reg, &old);
|
||||
if (ret < 0)
|
||||
goto out_unlock;
|
||||
|
||||
new = (old & ~mask) | (val & mask);
|
||||
*change = old != new;
|
||||
if (*change)
|
||||
ret = component->write(component, reg, new);
|
||||
ret = snd_soc_component_write(component, reg, new);
|
||||
out_unlock:
|
||||
mutex_unlock(&component->io_mutex);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue