From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Aug 2008 02:24:47 +0000 (-0700)
Subject: Revert "pcm_native.c: remove unused label"
X-Git-Tag: v2.6.27-rc3~83
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2.6.27-rc2-00020-g685d87f;p=linux-2.6-omap-h63xx.git

Revert "pcm_native.c: remove unused label"

This reverts commit 680db0136e0778a0d7e025af7572c6a8d82279e2.  The label
is actually used, but hidden behind CONFIG_SND_DEBUG and the horrible
snd_assert() macro.

That macro could probably be improved to be along the lines of

	#define snd_assert(expr, args...) do { if ((void)(expr),0) { args; } } while (0)

or similar to make sure that we always both evaluate 'expr' and parse
'args', but while gcc should optimize it all away, I'm too lazy to
really verify that.  So I'll just admit defeat and will continue to live
with the annoying warning.

Noted-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Linus "Grr.." Torvalds
---

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 333cff68c15..c49b9d9e303 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3259,6 +3259,7 @@ static int snd_pcm_fasync(int fd, struct file * file, int on)
 	runtime = substream->runtime;
 
 	err = fasync_helper(fd, file, on, &runtime->fasync);
+out:
 	unlock_kernel();
 	if (err < 0)
 		return err;