Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit b12d1e4f authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 3eb2ce82 dead99e8

sound/soc/soc-io.c

+2 −5
Original line number Diff line number Diff line
@@ -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);