Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
  ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
  ALSA: hda - Keep EAPD turned on for old Conexant chips
  ALSA: hda/realtek - Fix missing volume controls with ALC260
  ASoC: wm8940: Properly set codec->dapm.bias_level
  ALSA: hda - Fix pin-config for ASUS W90V
  ALSA: hda - Fix surround/CLFE headphone and speaker pins order
  ALSA: hda - Fix typo
  ALSA: Update the sound git tree URL
  ALSA: HDA: Add new revision for ALC662
  ASoC: max98095: Convert codec->hw_write to snd_soc_write
  ASoC: keep pointer to resource so it can be freed
  ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
  ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
  ASoC: da7210: Add support for line out and DAC
  ASoC: da7210: Add support for DAPM
  ALSA: hda/realtek - Fix DAC assignments of multiple speakers
  ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
  ASoC: Set sgtl5000->ldo in ldo_regulator_register
  ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
  ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
  ...

1 files changed, 7 insertions, 12 deletions

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index c74e228731ed..d7d2179c0363 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2058,16 +2058,12 @@ EXPORT_SYMBOL(snd_pcm_open_substream);
 
 static int snd_pcm_open_file(struct file *file,
                              struct snd_pcm *pcm,
-                             int stream,
-                             struct snd_pcm_file **rpcm_file)
+                             int stream)
 {
         struct snd_pcm_file *pcm_file;
         struct snd_pcm_substream *substream;
         int err;
 
-        if (rpcm_file)
-                *rpcm_file = NULL;
-
         err = snd_pcm_open_substream(pcm, stream, file, &substream);
         if (err < 0)
                 return err;
@@ -2083,8 +2079,7 @@ static int snd_pcm_open_file(struct file *file,
                 substream->pcm_release = pcm_release_private;
         }
         file->private_data = pcm_file;
-        if (rpcm_file)
-                *rpcm_file = pcm_file;
+
         return 0;
 }
 
@@ -2113,7 +2108,6 @@ static int snd_pcm_capture_open(struct inode *inode, struct file *file)
 static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)
 {
         int err;
-        struct snd_pcm_file *pcm_file;
         wait_queue_t wait;
 
         if (pcm == NULL) {
@@ -2131,7 +2125,7 @@ static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)
         add_wait_queue(&pcm->open_wait, &wait);
         mutex_lock(&pcm->open_mutex);
         while (1) {
-                err = snd_pcm_open_file(file, pcm, stream, &pcm_file);
+                err = snd_pcm_open_file(file, pcm, stream);
                 if (err >= 0)
                         break;
                 if (err == -EAGAIN) {
@@ -3156,8 +3150,8 @@ static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = {
 /*
  * mmap the DMA buffer on RAM
  */
-static int snd_pcm_default_mmap(struct snd_pcm_substream *substream,
-                                struct vm_area_struct *area)
+int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream,
+                             struct vm_area_struct *area)
 {
         area->vm_flags |= VM_RESERVED;
 #ifdef ARCH_HAS_DMA_MMAP_COHERENT
@@ -3177,6 +3171,7 @@ static int snd_pcm_default_mmap(struct snd_pcm_substream *substream,
         area->vm_ops = &snd_pcm_vm_ops_data_fault;
         return 0;
 }
+EXPORT_SYMBOL_GPL(snd_pcm_lib_default_mmap);
 
 /*
  * mmap the DMA buffer on I/O memory area
@@ -3242,7 +3237,7 @@ int snd_pcm_mmap_data(struct snd_pcm_substream *substream, struct file *file,
         if (substream->ops->mmap)
                 err = substream->ops->mmap(substream, area);
         else
-                err = snd_pcm_default_mmap(substream, area);
+                err = snd_pcm_lib_default_mmap(substream, area);
         if (!err)
                 atomic_inc(&substream->mmap_count);
         return err;