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

Commit 22315712 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Don't use codec->control_data in bulk write 



In order to facilitate merging with the register map I/O replace the use
of control_data for the bulk writes with direct lookup of the client data
from the device.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent bf3a9e13

sound/soc/soc-io.c

+2 −2
Original line number Diff line number Diff line
@@ -269,12 +269,12 @@ static int snd_soc_hw_bulk_write_raw(struct snd_soc_codec *codec, unsigned int r 
	switch (codec->control_type) {

#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))

	case SND_SOC_I2C:

		ret = i2c_master_send(codec->control_data, data, len);

		ret = i2c_master_send(to_i2c_client(codec->dev), data, len);

		break;

#endif

#if defined(CONFIG_SPI_MASTER)

	case SND_SOC_SPI:

		ret = spi_write(codec->control_data, data, len);

		ret = spi_write(to_spi_device(codec->dev), data, len);

		break;

#endif

	default: