diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 10:30:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 10:30:34 +0100 |
| commit | 6e0446cb4b6e2469a0db58fbe6dffcd63d3d4066 (patch) | |
| tree | 4f8f8700a5ba95cc033625f6b2964db435254d3d /sound | |
| parent | 709334c87dbdb44150ce436b3d13c814db0dcae9 (diff) | |
| parent | bc2580061e42c323d7777029f01318f395edac0d (diff) | |
| download | linux-3.10-6e0446cb4b6e2469a0db58fbe6dffcd63d3d4066.tar.gz linux-3.10-6e0446cb4b6e2469a0db58fbe6dffcd63d3d4066.tar.bz2 linux-3.10-6e0446cb4b6e2469a0db58fbe6dffcd63d3d4066.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8900.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index c9438dd62df..dbc368c0826 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c @@ -199,7 +199,7 @@ static void wm8900_reset(struct snd_soc_codec *codec) snd_soc_write(codec, WM8900_REG_RESET, 0); memcpy(codec->reg_cache, wm8900_reg_defaults, - sizeof(codec->reg_cache)); + sizeof(wm8900_reg_defaults)); } static int wm8900_hp_event(struct snd_soc_dapm_widget *w, |