From 620a4863655f8475a9e1d3460dfd15f50454923e Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 7 Apr 2010 18:29:46 +0200 Subject: [PATCH] --- yaml --- r: 193197 b: refs/heads/master c: d05468b72a32ec45aefb48caa00bd99350b9cf86 h: refs/heads/master i: 193195: b7bee76ed28d66797d611d0f0a800ff6b6402e01 v: v3 --- [refs] | 2 +- trunk/sound/core/pcm_native.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5d9677582d70..496a03c0eaf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68c7ccb8f85801655aa681391dc0ee037a2b66d4 +refs/heads/master: d05468b72a32ec45aefb48caa00bd99350b9cf86 diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c index 872887624030..cadba3087768 100644 --- a/trunk/sound/core/pcm_native.c +++ b/trunk/sound/core/pcm_native.c @@ -3303,18 +3303,13 @@ static int snd_pcm_fasync(int fd, struct file * file, int on) struct snd_pcm_file * pcm_file; struct snd_pcm_substream *substream; struct snd_pcm_runtime *runtime; - int err = -ENXIO; - lock_kernel(); pcm_file = file->private_data; substream = pcm_file->substream; if (PCM_RUNTIME_CHECK(substream)) - goto out; + return -ENXIO; runtime = substream->runtime; - err = fasync_helper(fd, file, on, &runtime->fasync); -out: - unlock_kernel(); - return err; + return fasync_helper(fd, file, on, &runtime->fasync); } /*