diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-11-10 10:30:03 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-11-10 10:30:03 -0500 |
commit | 3f225c07c7d0559f65b41250edd01a577fdba426 (patch) | |
tree | 753a9b9a9063e23d44986d974aeb2bc1986d7df8 /sound/core/rawmidi.c | |
parent | b7fe750fcceda4fa6bef399b0e2812562728ea82 (diff) | |
parent | 25d27eded1f4fc728e64f443adc339b5229be5d7 (diff) |
Merge branch 'topic/ctl-pid-lock' into topic/core-change
Diffstat (limited to 'sound/core/rawmidi.c')
-rw-r--r-- | sound/core/rawmidi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index 70d6f25ba526..4e26563431c8 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c | |||
@@ -413,7 +413,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) | |||
413 | subdevice = -1; | 413 | subdevice = -1; |
414 | read_lock(&card->ctl_files_rwlock); | 414 | read_lock(&card->ctl_files_rwlock); |
415 | list_for_each_entry(kctl, &card->ctl_files, list) { | 415 | list_for_each_entry(kctl, &card->ctl_files, list) { |
416 | if (kctl->pid == current->pid) { | 416 | if (kctl->pid == task_pid(current)) { |
417 | subdevice = kctl->prefer_rawmidi_subdevice; | 417 | subdevice = kctl->prefer_rawmidi_subdevice; |
418 | if (subdevice != -1) | 418 | if (subdevice != -1) |
419 | break; | 419 | break; |