openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2018-03-28 10:23:16 +08:00
parent 3eb2ce825e dead99e857
commit b12d1e4fbb
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/soc-io.c
View File

@ -88,19 +88,16 @@ static int snd_soc_component_update_bits_legacy(
unsigned int old, new; unsigned int old, new;
int ret; int ret;
if (!component->read || !component->write)
return -EIO;
mutex_lock(&component->io_mutex); mutex_lock(&component->io_mutex);
ret = component->read(component, reg, &old); ret = snd_soc_component_read(component, reg, &old);
if (ret < 0) if (ret < 0)
goto out_unlock; goto out_unlock;
new = (old & ~mask) | (val & mask); new = (old & ~mask) | (val & mask);
*change = old != new; *change = old != new;
if (*change) if (*change)
ret = component->write(component, reg, new); ret = snd_soc_component_write(component, reg, new);
out_unlock: out_unlock:
mutex_unlock(&component->io_mutex); mutex_unlock(&component->io_mutex);