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: (294 commits)
  S3C64XX: Staticise platform data for PCM devices
  ASoC: Rename controls with a / in wm_hubs
  snd-fm801: autodetect SF64-PCR (tuner-only) card
  ALSA: tea575x-tuner: fix mute
  ASoC: au1x: dbdma2: plug memleak in pcm device creation error path
  ASoC: au1x: dbdma2: fix oops on soc device removal.
  ALSA: hda - Fix memory leaks in the previous patch
  ALSA: hda - Add ALC661/259, ALC892/888VD support
  ALSA: opti9xx: remove snd_opti9xx fields
  ALSA: aaci - Clean up duplicate code
  ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT
  ALSA: hda - Add position_fix quirk for HP dv3
  ALSA: hda - Add a pin-fix for FSC Amilo Pi1505
  ALSA: hda - Fix Cxt5047 test mode
  ASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
  ASoC: sh: fsi: Add runtime PM support
  sh: ms7724se: Add runtime PM support for FSI
  ALSA: hda - Add a position_fix quirk for MSI Wind U115
  ALSA: opti-miro: add PnP detection
  ALSA: opti-miro: separate comon probing code
  ...

1 files changed, 12 insertions, 5 deletions

diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 70d6f25ba52..2f766123b15 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -242,8 +242,6 @@ static int assign_substream(struct snd_rawmidi *rmidi, int subdevice,
                 return -ENXIO;
         if (subdevice >= 0 && subdevice >= s->substream_count)
                 return -ENODEV;
-        if (s->substream_opened >= s->substream_count)
-                return -EAGAIN;
 
         list_for_each_entry(substream, &s->substreams, list) {
                 if (substream->opened) {
@@ -280,9 +278,10 @@ static int open_substream(struct snd_rawmidi *rmidi,
                 substream->active_sensing = 0;
                 if (mode & SNDRV_RAWMIDI_LFLG_APPEND)
                         substream->append = 1;
+                substream->pid = get_pid(task_pid(current));
+                rmidi->streams[substream->stream].substream_opened++;
         }
         substream->use_count++;
-        rmidi->streams[substream->stream].substream_opened++;
         return 0;
 }
 
@@ -413,7 +412,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)
                 subdevice = -1;
                 read_lock(&card->ctl_files_rwlock);
                 list_for_each_entry(kctl, &card->ctl_files, list) {
-                        if (kctl->pid == current->pid) {
+                        if (kctl->pid == task_pid(current)) {
                                 subdevice = kctl->prefer_rawmidi_subdevice;
                                 if (subdevice != -1)
                                         break;
@@ -466,7 +465,6 @@ static void close_substream(struct snd_rawmidi *rmidi,
                             struct snd_rawmidi_substream *substream,
                             int cleanup)
 {
-        rmidi->streams[substream->stream].substream_opened--;
         if (--substream->use_count)
                 return;
 
@@ -491,6 +489,9 @@ static void close_substream(struct snd_rawmidi *rmidi,
         snd_rawmidi_runtime_free(substream);
         substream->opened = 0;
         substream->append = 0;
+        put_pid(substream->pid);
+        substream->pid = NULL;
+        rmidi->streams[substream->stream].substream_opened--;
 }
 
 static void rawmidi_release_priv(struct snd_rawmidi_file *rfile)
@@ -1338,6 +1339,9 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry,
                                     substream->number,
                                     (unsigned long) substream->bytes);
                         if (substream->opened) {
+                                snd_iprintf(buffer,
+                                    "  Owner PID    : %d\n",
+                                    pid_vnr(substream->pid));
                                 runtime = substream->runtime;
                                 snd_iprintf(buffer,
                                     "  Mode         : %s\n"
@@ -1359,6 +1363,9 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry,
                                     substream->number,
                                     (unsigned long) substream->bytes);
                         if (substream->opened) {
+                                snd_iprintf(buffer,
+                                            "  Owner PID    : %d\n",
+                                            pid_vnr(substream->pid));
                                 runtime = substream->runtime;
                                 snd_iprintf(buffer,
                                             "  Buffer size  : %lu\n"