diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:30:34 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:30:34 -0500 |
| commit | 6e0446cb4b6e2469a0db58fbe6dffcd63d3d4066 (patch) | |
| tree | 4f8f8700a5ba95cc033625f6b2964db435254d3d | |
| parent | 709334c87dbdb44150ce436b3d13c814db0dcae9 (diff) | |
| parent | bc2580061e42c323d7777029f01318f395edac0d (diff) | |
Merge branch 'fix/asoc' into for-linus
| -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 c9438dd62df3..dbc368c08263 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) | |||
| 199 | snd_soc_write(codec, WM8900_REG_RESET, 0); | 199 | snd_soc_write(codec, WM8900_REG_RESET, 0); |
| 200 | 200 | ||
| 201 | memcpy(codec->reg_cache, wm8900_reg_defaults, | 201 | memcpy(codec->reg_cache, wm8900_reg_defaults, |
| 202 | sizeof(codec->reg_cache)); | 202 | sizeof(wm8900_reg_defaults)); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | static int wm8900_hp_event(struct snd_soc_dapm_widget *w, | 205 | static int wm8900_hp_event(struct snd_soc_dapm_widget *w, |