summaryrefslogtreecommitdiff
path: root/sound/soc/soc-io.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-13 21:44:52 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-13 22:17:33 +0400
commit223157121404a7ca4deaf2aa31a57cad8d133d07 (patch)
tree703757de2f1479ef7207f314d31ba68eea16d4da /sound/soc/soc-io.c
parentbf3a9e137cf1a1c664f44acfa36a487f0437f6aa (diff)
downloadlinux-223157121404a7ca4deaf2aa31a57cad8d133d07.tar.xz
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: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/soc-io.c')
-rw-r--r--sound/soc/soc-io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 855e5cde2793..df9338aa1a52 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -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: