diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 12:11:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 12:11:05 -0500 |
| commit | a8aa1ebdf880ebe7b5738ccebf67e18d62cbdc0b (patch) | |
| tree | c58fe906727ee290c9e0f77a2f659fb61c378db0 /sound/soc | |
| parent | 8f0ddf91f2aeb09602373e400cf8b403e9017210 (diff) | |
| parent | a9e060571a057c132240753b7f815f4a1e0320a3 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ac97_codec - increase timeout for analog sections to 5 second
ASoC: Correct code taking the size of a pointer
ALSA: hda - Add PCI IDs for Nvidia G2xx-series
ALSA: sound/isa/gus: Correct code taking the size of a pointer
ALSA: hda: Fix max PCM level to 0 dB for AD1981_HP
ALSA: hda: Use ALC260_WILL quirk for another Acer model (0x1025007f)
Diffstat (limited to 'sound/soc')
| -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, |