diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:49 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:49 +0100 |
| commit | d807500a2472445d05ce641bf09438e3d72eeb4f (patch) | |
| tree | 09523f2161c042c874264890c509417fb0681839 /sound/core/pcm.c | |
| parent | c7ccfd060fe38d1029db860199a04d9b3dd4694d (diff) | |
| parent | 8b22d943c34b616eefbd6d2f8f197a53b1f29fd0 (diff) | |
| download | linux-3.10-d807500a2472445d05ce641bf09438e3d72eeb4f.tar.gz linux-3.10-d807500a2472445d05ce641bf09438e3d72eeb4f.tar.bz2 linux-3.10-d807500a2472445d05ce641bf09438e3d72eeb4f.zip | |
Merge branch 'topic/pcm-cleanup' into for-linus
Diffstat (limited to 'sound/core/pcm.c')
| -rw-r--r-- | sound/core/pcm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 192a433a240..37f567a68ef 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -667,7 +667,6 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count) spin_lock_init(&substream->self_group.lock); INIT_LIST_HEAD(&substream->self_group.substreams); list_add_tail(&substream->link_list, &substream->self_group.substreams); - spin_lock_init(&substream->timer_lock); atomic_set(&substream->mmap_count, 0); prev = substream; } |