Commit 223157121404a7ca4deaf2aa31a57cad8d133d07
1 parent
bf3a9e137c
Exists in
master
and in
6 other branches
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>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
sound/soc/soc-io.c
| ... | ... | @@ -269,12 +269,12 @@ |
| 269 | 269 | switch (codec->control_type) { |
| 270 | 270 | #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) |
| 271 | 271 | case SND_SOC_I2C: |
| 272 | - ret = i2c_master_send(codec->control_data, data, len); | |
| 272 | + ret = i2c_master_send(to_i2c_client(codec->dev), data, len); | |
| 273 | 273 | break; |
| 274 | 274 | #endif |
| 275 | 275 | #if defined(CONFIG_SPI_MASTER) |
| 276 | 276 | case SND_SOC_SPI: |
| 277 | - ret = spi_write(codec->control_data, data, len); | |
| 277 | + ret = spi_write(to_spi_device(codec->dev), data, len); | |
| 278 | 278 | break; |
| 279 | 279 | #endif |
| 280 | 280 | default: |