diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-11 08:43:13 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-11 08:43:13 +0200 |
| commit | c6774bcd33b21d57457d4c604388670efdf03258 (patch) | |
| tree | 71240ff9b0754be01350355a38604d1f932eceec /sound/soc/soc-cache.c | |
| parent | 6b4e9012961cb9be82bae4258f34e33da32340a4 (diff) | |
| parent | 2e2211a387e70c62e1249822a94f4a33933ecd62 (diff) | |
| download | linux-3.10-c6774bcd33b21d57457d4c604388670efdf03258.tar.gz linux-3.10-c6774bcd33b21d57457d4c604388670efdf03258.tar.bz2 linux-3.10-c6774bcd33b21d57457d4c604388670efdf03258.zip | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/soc-cache.c')
| -rw-r--r-- | sound/soc/soc-cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 472af38188c..adbc68ce905 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -340,7 +340,7 @@ static unsigned int snd_soc_16_8_read_i2c(struct snd_soc_codec *codec, static unsigned int snd_soc_16_8_read(struct snd_soc_codec *codec, unsigned int reg) { - u16 *cache = codec->reg_cache; + u8 *cache = codec->reg_cache; reg &= 0xff; if (reg >= codec->reg_cache_size) @@ -351,7 +351,7 @@ static unsigned int snd_soc_16_8_read(struct snd_soc_codec *codec, static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) { - u16 *cache = codec->reg_cache; + u8 *cache = codec->reg_cache; u8 data[3]; int ret; |