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

Unverified Commit dead99e8 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: soc-io: Fix snd_soc_component_update_bits_legacy 



After the codec to component conversion codecs with custom read/write
function will no longer able to use update_bits as their io callbacks are
registered at component->driver level and not in component level.

To not complicate the code further, lets just use the
snd_soc_component_read/snd_soc_component_write function and let them sort
out the correct io function to call.

Fixes: d0ff8ba5 ("ASoC: add Component level .read/.write")
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7928b2cb

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);