diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-23 14:17:09 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-23 14:17:09 -0400 |
| commit | a67061e2a90bd023e7ed6518fe3dfeb24fe295ea (patch) | |
| tree | 563afe94e0d0e82116be59dd9472cb854a4a28a8 /sound | |
| parent | 639f817fe85db7267ca70cbeab9205dcb5c2ee27 (diff) | |
| parent | cb6f66a2d278e57a6c9d8fb59bd9ebd8ab3965c2 (diff) | |
Merge remote-tracking branch 'asoc/fix/max98088' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/max98088.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 3eeada57e87d..566a367c94fa 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c | |||
| @@ -1612,7 +1612,7 @@ static int max98088_dai2_digital_mute(struct snd_soc_dai *codec_dai, int mute) | |||
| 1612 | 1612 | ||
| 1613 | static void max98088_sync_cache(struct snd_soc_codec *codec) | 1613 | static void max98088_sync_cache(struct snd_soc_codec *codec) |
| 1614 | { | 1614 | { |
| 1615 | u16 *reg_cache = codec->reg_cache; | 1615 | u8 *reg_cache = codec->reg_cache; |
| 1616 | int i; | 1616 | int i; |
| 1617 | 1617 | ||
| 1618 | if (!codec->cache_sync) | 1618 | if (!codec->cache_sync) |