diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 12:14:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 12:14:39 -0400 |
| commit | 8ac1c101ec73e60635257ed9af1c6ab423c535b4 (patch) | |
| tree | b01a39fb1ce34e82aeea255740a5ac7ae8fb62f1 /sound/soc | |
| parent | 0e9871df2389560e94ba01e40959140ee56def4b (diff) | |
| parent | 672cc6c6c72673570b5ca44fe8a8b9ed604f5a4f (diff) | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] version 1.0.14
[ALSA] hda-codec - Fix STAC922x capture boost level
[ALSA] hda-codec - Fix input with STAC92xx
[ALSA] hda-codec - Fix pin configs for Gateway MX6453
[ALSA] hda-codec - Add support for MSI K9N Ultra
[ALSA] hda-codec - Add quirk for Supermicro PDSBA to alc883_cfg_tbl[]
[ALSA] hda-codec - Add quirk for MSI S420
[ALSA] Fix ASoC s3c24xx-pcm spinlock bug
[ALSA] hda-intel: fix ASUS M2V detection
[ALSA] ali5451 - Fix possible NULL dereference
[ALSA] hda-codec - Add support for ASUS A8J modem
[ALSA] HDA: Fix headphone mute issue on non-eapd Conexant systems
[ALSA] HDA: Add more systems to Sigmatel codec
[ALSA] HDA: Add support for Gateway NX860
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/s3c24xx/s3c24xx-pcm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index 21dc6974d6..bfbdc3cbd4 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c | |||
| @@ -337,6 +337,8 @@ static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) | |||
| 337 | if (prtd == NULL) | 337 | if (prtd == NULL) |
| 338 | return -ENOMEM; | 338 | return -ENOMEM; |
| 339 | 339 | ||
| 340 | spin_lock_init(&prtd->lock); | ||
| 341 | |||
| 340 | runtime->private_data = prtd; | 342 | runtime->private_data = prtd; |
| 341 | return 0; | 343 | return 0; |
| 342 | } | 344 | } |