diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-28 13:03:58 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-28 13:03:58 +0200 |
| commit | cdccfc8dc0bf62a1da327324a8d639139acc9279 (patch) | |
| tree | dca7934b27d510c9c006558979ebc48e07a531cf /sound/core | |
| parent | b21a8ee67013372f439fbd1591e91d09de49bb9c (diff) | |
| parent | c6b358748e19ce7e230b0926ac42696bc485a562 (diff) | |
| download | linux-cdccfc8dc0bf62a1da327324a8d639139acc9279.tar.bz2 | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/init.c | 4 | ||||
| -rw-r--r-- | sound/core/pcm_native.c | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 3e65da21a08c..a0080aa45ae9 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -848,6 +848,7 @@ int snd_card_file_add(struct snd_card *card, struct file *file) return -ENOMEM; mfile->file = file; mfile->disconnected_f_op = NULL; + INIT_LIST_HEAD(&mfile->shutdown_list); spin_lock(&card->files_lock); if (card->shutdown) { spin_unlock(&card->files_lock); @@ -883,6 +884,9 @@ int snd_card_file_remove(struct snd_card *card, struct file *file) list_for_each_entry(mfile, &card->files_list, list) { if (mfile->file == file) { list_del(&mfile->list); + spin_lock(&shutdown_lock); + list_del(&mfile->shutdown_list); + spin_unlock(&shutdown_lock); if (mfile->disconnected_f_op) fops_put(mfile->disconnected_f_op); found = mfile; diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index ae42b6509ce4..fe5c8036beba 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3201,15 +3201,6 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, EXPORT_SYMBOL(snd_pcm_lib_mmap_iomem); #endif /* SNDRV_PCM_INFO_MMAP */ -/* mmap callback with pgprot_noncached */ -int snd_pcm_lib_mmap_noncached(struct snd_pcm_substream *substream, - struct vm_area_struct *area) -{ - area->vm_page_prot = pgprot_noncached(area->vm_page_prot); - return snd_pcm_default_mmap(substream, area); -} -EXPORT_SYMBOL(snd_pcm_lib_mmap_noncached); - /* * mmap DMA buffer */ |