diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-08 11:35:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-08 11:35:48 +0300 |
| commit | f0f20a16983f7d3713ab695e19bd15eca4e7533f (patch) | |
| tree | 838fddcc99c8d68c8b8a1b575276b12e974740f1 /sound/soc/codecs/ak4104.c | |
| parent | f1cf9a666de65254b0c56b4dec8ca2ecdab5b620 (diff) | |
| parent | e555317c083fda01f516d2153589e82514e20e70 (diff) | |
| download | linux-f0f20a16983f7d3713ab695e19bd15eca4e7533f.tar.xz | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/ak4104.c')
| -rw-r--r-- | sound/soc/codecs/ak4104.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c index b9ef7e45891d..b68d99fb6af0 100644 --- a/sound/soc/codecs/ak4104.c +++ b/sound/soc/codecs/ak4104.c @@ -90,12 +90,10 @@ static int ak4104_spi_write(struct snd_soc_codec *codec, unsigned int reg, if (reg >= codec->reg_cache_size) return -EINVAL; - reg &= AK4104_REG_MASK; - reg |= AK4104_WRITE; - /* only write to the hardware if value has changed */ if (cache[reg] != value) { - u8 tmp[2] = { reg, value }; + u8 tmp[2] = { (reg & AK4104_REG_MASK) | AK4104_WRITE, value }; + if (spi_write(spi, tmp, sizeof(tmp))) { dev_err(&spi->dev, "SPI write failed\n"); return -EIO; |