From: Jonathan Corbet <corbet@lwn.net>
Date: Mon, 23 Jun 2008 23:40:43 +0000 (-0600)
Subject: snd/PCM: fasync BKL pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2db9f0a35a4e4ad7cee756a4e0dabb7c1c8b6c72;p=linux-2.6-omap-h63xx.git

snd/PCM: fasync BKL pushdown

Chances are this is unneeded, but the code is twisty enough that it is hard
to tell.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 61f5d425b63..c49b9d9e303 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -22,6 +22,7 @@
 #include <linux/mm.h>
 #include <linux/file.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/time.h>
 #include <linux/pm_qos_params.h>
 #include <linux/uio.h>
@@ -3249,14 +3250,17 @@ 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;
+	int err = -ENXIO;
 
+	lock_kernel();
 	pcm_file = file->private_data;
 	substream = pcm_file->substream;
-	snd_assert(substream != NULL, return -ENXIO);
+	snd_assert(substream != NULL, goto out);
 	runtime = substream->runtime;
 
 	err = fasync_helper(fd, file, on, &runtime->fasync);
+out:
+	unlock_kernel();
 	if (err < 0)
 		return err;
 	return 0;